X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=proguard.flags;h=624af0fb0e30184d07c5dc15a3e9172775c0c3ad;hb=7486e9b01d635bafd9e36b8aebf088f42637d64e;hp=66e53673e50a31abd9cceb3983f3eec04c29f7cc;hpb=c603e749e4332e86a02ba6a934c66665930ea45e;p=android-x86%2Fpackages-apps-Camera2.git

diff --git a/proguard.flags b/proguard.flags
index 66e53673e..624af0fb0 100644
--- 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(...);
 }
@@ -35,3 +32,14 @@
 
 # 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(...);
+}
+