summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWu-cheng Li <wuchengli@google.com>2012-08-28 00:11:30 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-08-28 00:11:31 -0700
commitab586616e72cc6474ee812644a562ceb75b52801 (patch)
tree50beb4109a0d08e655da039b1b651b4fe8d05401
parent46f9d24b8440fe790aa4bdd625dbf231b140df17 (diff)
parent8745db70dec195c8e5fcfe997f167e8ba1a33264 (diff)
downloadandroid_packages_apps_Gallery2-ab586616e72cc6474ee812644a562ceb75b52801.tar.gz
android_packages_apps_Gallery2-ab586616e72cc6474ee812644a562ceb75b52801.tar.bz2
android_packages_apps_Gallery2-ab586616e72cc6474ee812644a562ceb75b52801.zip
Merge "Register STILL_IMAGE_CAMERA_SECURE intent in the manifest." into gb-ub-photos-arches
-rw-r--r--AndroidManifest.xml4
1 files changed, 4 insertions, 0 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 2ef8086c2..b48af2890 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -270,6 +270,10 @@
<action android:name="android.media.action.STILL_IMAGE_CAMERA" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
+ <intent-filter>
+ <action android:name="android.media.action.STILL_IMAGE_CAMERA_SECURE" />
+ <category android:name="android.intent.category.DEFAULT" />
+ </intent-filter>
</activity>
<activity-alias android:icon="@mipmap/ic_launcher_camera"