summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Charlton <evanc@google.com>2014-09-16 08:47:59 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-09-16 08:47:59 +0000
commitd3443070e3595a8d00144bfe9e14a5d4d07c9506 (patch)
tree7ea7e80e9f5a508088a1777fac3293b7e137427b
parentb186bb879f1f9fea08297c0fa98cd2e0bb2df287 (diff)
parenteba6a7fd308ca04b38acaf8e17cc3ecf82b1610d (diff)
am eba6a7fd: am 07229c50: Merge "Use the BROADCAST_STICKY permission" into lmp-dev
* commit 'eba6a7fd308ca04b38acaf8e17cc3ecf82b1610d': Use the BROADCAST_STICKY permission
-rw-r--r--AndroidManifest.xml1
1 files changed, 1 insertions, 0 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 375980840..477a44cee 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -47,6 +47,7 @@
<uses-permission android:name="android.permission.ALLOW_ANY_CODEC_FOR_PLAYBACK" />
<uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT"/>
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+ <uses-permission android:name="android.permission.BROADCAST_STICKY" />
<!-- This tells the activity manager to not delay any of our activity
start requests, even if they happen immediately after the user
presses home. -->