summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristine Chen <christinech@google.com>2013-10-07 12:19:03 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-10-07 12:19:03 -0700
commit4fe6b76b6ed79e8bc582f5f9f1352a276d7f7f2d (patch)
treea6b332a2d76b0971fd0f7c6808bf7752d8ce183d
parent22ebbd4545ea2bc68c9c28f0d26eaa987a538605 (diff)
parent888df858aafc84ec9bbb32b6e4e6d08d2a40664a (diff)
am 888df858: Merge "Adds STOP_APP_SWITCHES permission." into klp-dev
* commit '888df858aafc84ec9bbb32b6e4e6d08d2a40664a': Adds STOP_APP_SWITCHES permission.
-rw-r--r--AndroidManifest.xml4
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"