summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWu-cheng Li <wuchengli@google.com>2012-09-26 20:35:28 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-09-26 20:35:28 -0700
commit8c09bd6a63613e5d0a2736e0b0960851ff72a17c (patch)
tree1d46a383b2459482615ac973c223b5c528a2dda3
parentfa6203dce535093150b9e3e129674c0c5a2ef218 (diff)
parent53605baff27905497fa38ec3887db1d031af5152 (diff)
downloadandroid_packages_apps_Gallery2-8c09bd6a63613e5d0a2736e0b0960851ff72a17c.tar.gz
android_packages_apps_Gallery2-8c09bd6a63613e5d0a2736e0b0960851ff72a17c.tar.bz2
android_packages_apps_Gallery2-8c09bd6a63613e5d0a2736e0b0960851ff72a17c.zip
am 53605baf: Merge "Fix background replacement crash in camcorder." into gb-ub-photos-arches
* commit '53605baff27905497fa38ec3887db1d031af5152': Fix background replacement crash in camcorder.
-rw-r--r--proguard.flags6
1 files changed, 6 insertions, 0 deletions
diff --git a/proguard.flags b/proguard.flags
index 098a540c9..7cd6c19c1 100644
--- a/proguard.flags
+++ b/proguard.flags
@@ -25,6 +25,12 @@
public void onProtectiveCurtainClick(...);
}
+-keep class com.android.camera.VideoModule {
+ public boolean isRecording();
+ public void onCancelBgTraining(...);
+ public void onProtectiveCurtainClick(...);
+}
+
-keep class * extends android.app.Activity {
@com.android.camera.OnClickAttr <methods>;
}