diff options
| author | Wu-cheng Li <wuchengli@google.com> | 2012-09-17 17:32:59 +0800 |
|---|---|---|
| committer | Wu-cheng Li <wuchengli@google.com> | 2012-09-18 11:00:29 +0800 |
| commit | 2e346284c10c968300833708aa3c8acd8cf5abe7 (patch) | |
| tree | 54c2029168858cd8e13f3db2d33e1d2fc157a9d5 /AndroidManifest.xml | |
| parent | 8fd3e79fbe43e002751c448fb273df085f75cbbf (diff) | |
| download | android_packages_apps_Gallery2-2e346284c10c968300833708aa3c8acd8cf5abe7.tar.gz android_packages_apps_Gallery2-2e346284c10c968300833708aa3c8acd8cf5abe7.tar.bz2 android_packages_apps_Gallery2-2e346284c10c968300833708aa3c8acd8cf5abe7.zip | |
Use a different task affinity for secure camera.
This makes sure non-secure camera activity is not started in
secure lock screen. Also add excludeFromRecents for secure
camera.
bug:7148152
Change-Id: I18a10ccf95f22563aad59d5d936470af47596b91
Diffstat (limited to 'AndroidManifest.xml')
| -rw-r--r-- | AndroidManifest.xml | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index b2c6c72ff..f9035fa5d 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -291,15 +291,26 @@ <category android:name="android.intent.category.DEFAULT" /> </intent-filter> <intent-filter> - <action android:name="android.media.action.STILL_IMAGE_CAMERA_SECURE" /> + <action android:name="android.media.action.VIDEO_CAMERA" /> <category android:name="android.intent.category.DEFAULT" /> </intent-filter> <intent-filter> - <action android:name="android.media.action.VIDEO_CAMERA" /> + <action android:name="android.media.action.VIDEO_CAPTURE" /> <category android:name="android.intent.category.DEFAULT" /> </intent-filter> + </activity> + + <activity android:name="com.android.camera.SecureCameraActivity" + android:taskAffinity="com.android.camera.SecureCameraActivity" + android:excludeFromRecents="true" + android:label="@string/camera_label" + android:theme="@style/Theme.Camera" + android:icon="@mipmap/ic_launcher_camera" + android:configChanges="orientation|screenSize|keyboardHidden" + android:clearTaskOnLaunch="true" + android:windowSoftInputMode="stateAlwaysHidden|adjustPan"> <intent-filter> - <action android:name="android.media.action.VIDEO_CAPTURE" /> + <action android:name="android.media.action.STILL_IMAGE_CAMERA_SECURE" /> <category android:name="android.intent.category.DEFAULT" /> </intent-filter> </activity> |