Launch PermissionsActivity if CameraActivity resume is called without critical permis...

[android-x86/packages-apps-Camera2.git] / proguard.flags

diff --git a/proguard.flags b/proguard.flags
index 8250933..624af0f 100644 (file)
--- a/proguard.flags
+++ b/proguard.flags
@@ -1,26 +1,23 @@
 # Disable the warnings of using dynamic method call in common library.
 -dontnote com.android.gallery3d.common.*
 
-# Keep all classes extended from com.android.gallery3d.common.Entry
-# Since we annotate on the fields and use reflection to create SQL
-# according to those field.
-
--keep class * extends com.android.gallery3d.common.Entry {
-    @com.android.gallery3d.common.Entry$Column <fields>;
-}
-
 # ctors of subclasses of CameraPreference are called with Java reflection.
 -keep class * extends com.android.camera.CameraPreference {
   <init>(...);
 }
 
--keep class com.android.camera.ActivityBase {
-  public int getResultCode();
-  public android.content.Intent getResultData();
+-keep class com.android.camera.CameraActivity {
+  public boolean isRecording();
+  public long getAutoFocusTime();
+  public long getShutterLag();
+  public long getShutterToPictureDisplayedTime();
+  public long getPictureDisplayedToJpegCallbackTime();
+  public long getJpegCallbackFinishTime();
+  public long getCaptureStartTime();
+  public long getFirstPreviewTime();
 }
 
--keep class com.android.camera.VideoCamera {
-  public boolean isRecording();
+-keep class com.android.camera.VideoModule {
   public void onCancelBgTraining(...);
   public void onProtectiveCurtainClick(...);
 }
@@ -32,3 +29,17 @@
 -keep class com.android.camera.CameraHolder {
   public static void injectMockCamera(...);
 }
+
+# Disable the warnings of using dynamic method calls in EffectsRecorder
+-dontnote com.android.camera.EffectsRecorder
+
+# For unit testing:
+
+# - Required for running exif tests on userdebug
+-keep class com.android.gallery3d.exif.ExifTag { *; }
+-keep class com.android.gallery3d.exif.ExifData { *; }
+-keep class com.android.gallery3d.exif.ExifInterface { *; }
+-keepclassmembers class com.android.gallery3d.exif.Util {
+  *** closeSilently(...);
+}
+