summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Charlton <evanc@google.com>2014-09-16 16:46:39 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-09-16 16:46:39 +0000
commit17f97b2045c9801d8d8c123b6df2695b7d57d66a (patch)
tree3d9832ebe642aff4c9f9e7507990aadc668bb538
parent9abac14d973e7e99b7f51f0c79690545b6e86ee8 (diff)
parent9c9409a1f64dd7fd884747f79d1cada7aa4ad105 (diff)
am 9c9409a1: am 07229c50: Merge "Use the BROADCAST_STICKY permission" into lmp-dev
* commit '9c9409a1f64dd7fd884747f79d1cada7aa4ad105': 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. -->