diff options
| author | Christine Chen <christinech@google.com> | 2013-10-07 12:24:41 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-07 12:24:41 -0700 |
| commit | 47ae36b201c17c1659c78e4d46b16e5e6ed792a8 (patch) | |
| tree | a6b332a2d76b0971fd0f7c6808bf7752d8ce183d | |
| parent | 076a19fbe59b8d7ccf8a6c3329e218e7ced749ce (diff) | |
| parent | c6b2d2fbb6124d25a37d9e11811e92dfd84ebaa9 (diff) | |
am c6b2d2fb: am 4fe6b76b: am 888df858: Merge "Adds STOP_APP_SWITCHES permission." into klp-dev
* commit 'c6b2d2fbb6124d25a37d9e11811e92dfd84ebaa9':
Adds STOP_APP_SWITCHES permission.
| -rw-r--r-- | AndroidManifest.xml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 99602f66e..46a5387ad 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -45,6 +45,10 @@ <!-- allow broadcasting secret code intents that reboot the phone --> <uses-permission android:name="android.permission.REBOOT" /> <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" /> + <!-- This tells the activity manager to not delay any of our activity + start requests, even if they happen immediately after the user + presses home. --> + <uses-permission android:name="android.permission.STOP_APP_SWITCHES" /> <application android:name="DialerApplication" |