summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com>2023-10-19 09:19:50 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-10-19 09:19:50 +0000
commitacb97bbc24a2b51d1903fe3e29e4903039250b4f (patch)
tree091839e7b16f8020e2c024c0abe15d2c92315d30
parentb4bebac170cc233b311ba7e5ea2d725847a4722e (diff)
parent1d582c52b3d7f329eb49847cc2170ddc8dc4d126 (diff)
downloadGallery2-acb97bbc24a2b51d1903fe3e29e4903039250b4f.tar.gz
Merge "Fix InstantiationException crash" into main am: adb236d284 am: 1d582c52b3
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Gallery2/+/2796112 Change-Id: Ib03eedbdcd72b3674f6c20fbfcfc28348fc63b08 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();