summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com>2023-10-19 09:52:28 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-10-19 09:52:28 +0000
commit174c0862b19a68771607857914cccd12e7713e85 (patch)
tree091839e7b16f8020e2c024c0abe15d2c92315d30
parentb2c586806cbcd701d3846c5316ebb32e0172699f (diff)
parentacb97bbc24a2b51d1903fe3e29e4903039250b4f (diff)
downloadGallery2-174c0862b19a68771607857914cccd12e7713e85.tar.gz
Merge "Fix InstantiationException crash" into main am: adb236d284 am: 1d582c52b3 am: acb97bbc24
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/2796112 Change-Id: I738cb8ff848d40b2c2d5846aacd3f6d7032335fc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--proguard.flags5
1 files changed, 5 insertions, 0 deletions
diff --git a/proguard.flags b/proguard.flags
index 5fde2d397..4054922b0 100644
--- a/proguard.flags
+++ b/proguard.flags
@@ -14,6 +14,11 @@
<init>(...);
}
+# ctors of subclasses of ActivityState are called with Java reflection.
+-keep class * extends com.android.gallery3d.app.ActivityState {
+ <init>(...);
+}
+
-keep class com.android.camera.CameraActivity {
public boolean isRecording();
public long getAutoFocusTime();