summaryrefslogtreecommitdiffstats
path: root/AndroidManifest.xml
diff options
context:
space:
mode:
authorPuneet Lall <puneetl@google.com>2014-09-25 15:05:47 -0700
committerPuneet Lall <puneetl@google.com>2014-10-03 14:26:17 -0700
commit4de9b72f79fe256766f25497bff44cb5533b7508 (patch)
tree32d2a4229ef58c0b31540613ed2116745347f782 /AndroidManifest.xml
parent42c6acb68103692ce4142d1b013dfced203c2271 (diff)
downloadandroid_packages_apps_Camera2-4de9b72f79fe256766f25497bff44cb5533b7508.tar.gz
android_packages_apps_Camera2-4de9b72f79fe256766f25497bff44cb5533b7508.tar.bz2
android_packages_apps_Camera2-4de9b72f79fe256766f25497bff44cb5533b7508.zip
Use singleTask to improve unsecure lockscreen startup
This enables warm-starts from the lockscreen by reusing the same activity if possible. Bug: 16035858 Change-Id: I4b1ce0c290e209a5098e3f3e71509e0ca86e1845
Diffstat (limited to 'AndroidManifest.xml')
-rw-r--r--AndroidManifest.xml1
1 files changed, 1 insertions, 0 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index e187f99fd..01c9ddaf7 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -53,6 +53,7 @@
android:clearTaskOnLaunch="true"
android:configChanges="orientation|screenSize|keyboardHidden"
android:label="@string/app_name"
+ android:launchMode="singleTask"
android:taskAffinity="com.android.camera.CameraActivity"
android:theme="@style/Theme.Camera"
android:windowSoftInputMode="stateAlwaysHidden|adjustPan" >