summaryrefslogtreecommitdiffstats
path: root/packages/Shell
diff options
context:
space:
mode:
authorSvetoslav <svetoslavganov@google.com>2014-10-22 23:28:33 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-10-22 23:28:33 +0000
commit6b6a4873c34e3fa9be9eafc46cdf680e6d9d5877 (patch)
tree7bf9a5048b9571df0167146c39f93a03cb05f73b /packages/Shell
parent8c5304a95d30d3e994ad5e27ed8bed50a38b68e4 (diff)
parent8528259fa015d8666026b88534d23bcd2b7929da (diff)
downloadframeworks_base-6b6a4873c34e3fa9be9eafc46cdf680e6d9d5877.zip
frameworks_base-6b6a4873c34e3fa9be9eafc46cdf680e6d9d5877.tar.gz
frameworks_base-6b6a4873c34e3fa9be9eafc46cdf680e6d9d5877.tar.bz2
am 8528259f: am 71de484d: am 1eb6a2f0: Merge "Grant the shell user a permission to let apps host widgets." into lmp-mr1-dev
* commit '8528259fa015d8666026b88534d23bcd2b7929da': Grant the shell user a permission to let apps host widgets.
Diffstat (limited to 'packages/Shell')
-rw-r--r--packages/Shell/AndroidManifest.xml1
1 files changed, 1 insertions, 0 deletions
diff --git a/packages/Shell/AndroidManifest.xml b/packages/Shell/AndroidManifest.xml
index 7e6afa6..3c44245 100644
--- a/packages/Shell/AndroidManifest.xml
+++ b/packages/Shell/AndroidManifest.xml
@@ -92,6 +92,7 @@
<uses-permission android:name="android.permission.FRAME_STATS" />
<uses-permission android:name="android.permission.BIND_APPWIDGET" />
<uses-permission android:name="android.permission.UPDATE_APP_OPS_STATS" />
+ <uses-permission android:name="android.permission.MODIFY_APPWIDGET_BIND_PERMISSIONS"/>
<application android:label="@string/app_label">
<provider