diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-03-09 12:53:08 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2023-03-09 12:53:08 +0000 |
commit | 7e70cf0d8ddb327fab144bc74acf4ca669720165 (patch) | |
tree | 5de02df66f067158da709d281a6b10becff5add9 | |
parent | 18bf4491fa6100139230d0e1a52c63ba358b62c9 (diff) | |
parent | e55251d81525c7afc3dd6e89bdf52428ae38eed3 (diff) | |
download | support-snap-temp-L18300000960616631.tar.gz |
Merge "Merge cherrypicks of ['android-review.googlesource.com/2465473', 'android-review.googlesource.com/2468900'] into androidx-camera-release." into androidx-camera-releasesnap-temp-L92200000960616210snap-temp-L86400000960617124snap-temp-L78300000960610950snap-temp-L53700000960610075snap-temp-L18300000960616631snap-temp-L16400000960611143snap-temp-L10900000960609885
-rw-r--r-- | camera/camera-extensions/proguard-rules.pro | 1 | ||||
-rw-r--r-- | libraryversions.toml | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/camera/camera-extensions/proguard-rules.pro b/camera/camera-extensions/proguard-rules.pro index f468308ae6c..898fbf8198d 100644 --- a/camera/camera-extensions/proguard-rules.pro +++ b/camera/camera-extensions/proguard-rules.pro @@ -15,3 +15,4 @@ # Needs to keep the classes implementing the vendor library interfaces in the extensions module. # Otherwise, it will cause AbstractMethodError if proguard is enabled. -keep class androidx.camera.extensions.ExtensionsManager$** {*;} +-keep class androidx.camera.extensions.internal.sessionprocessor.AdvancedSessionProcessor$** {*;} diff --git a/libraryversions.toml b/libraryversions.toml index 2cd753d396e..7d3a626c616 100644 --- a/libraryversions.toml +++ b/libraryversions.toml @@ -13,7 +13,7 @@ BIOMETRIC = "1.2.0-alpha06" BLUETOOTH = "1.0.0-alpha01" BROWSER = "1.5.0-alpha01" BUILDSRC_TESTS = "1.0.0-alpha01" -CAMERA = "1.2.1" +CAMERA = "1.2.2" CAMERA_PIPE = "1.0.0-alpha01" CARDVIEW = "1.1.0-alpha01" CAR_APP = "1.3.0-beta02" |