summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Charlton <evanc@google.com>2014-09-16 09:02:30 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-09-16 09:02:30 +0000
commitaee9b8186a6b6d9c5391c352ec6ee90a44abf850 (patch)
tree3cdf6d3984135d3cbcdc425fece5acfda1829cf3
parent979f413d2437fd4c9a28767343ec7c2aadf8dbf1 (diff)
parentd3443070e3595a8d00144bfe9e14a5d4d07c9506 (diff)
am d3443070: am eba6a7fd: am 07229c50: Merge "Use the BROADCAST_STICKY permission" into lmp-dev
* commit 'd3443070e3595a8d00144bfe9e14a5d4d07c9506': 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. -->