summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Charlton <evanc@google.com>2014-09-16 08:32:05 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-09-16 08:32:05 +0000
commit9c9409a1f64dd7fd884747f79d1cada7aa4ad105 (patch)
tree4e400510da851f1c4854b7c4d75f350c44129d27
parent8468b6deebb9157246a3d4abc7185ff9d3d58b2f (diff)
parent07229c50557abf9aaa1b71d3fee8e2aac2f9f179 (diff)
am 07229c50: Merge "Use the BROADCAST_STICKY permission" into lmp-dev
* commit '07229c50557abf9aaa1b71d3fee8e2aac2f9f179': 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. -->