diff options
| author | Michael Wright <michaelwr@google.com> | 2015-03-23 15:55:53 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-23 15:55:53 +0000 |
| commit | b42baaa829be7efa692088e97a44712daecbf5f4 (patch) | |
| tree | 548486d0c2798c9e1a6615ec0b1e2e9f286b86fd /packages/SystemUI | |
| parent | 2f12b803e913117edbed7a9409f04b1d00686eba (diff) | |
| parent | 978cfc39a10e1b95f9d6dfb5c8e9eb58a10ce0ec (diff) | |
| download | frameworks_base-b42baaa829be7efa692088e97a44712daecbf5f4.zip frameworks_base-b42baaa829be7efa692088e97a44712daecbf5f4.tar.gz frameworks_base-b42baaa829be7efa692088e97a44712daecbf5f4.tar.bz2 | |
am 978cfc39: Merge "SystemUI needs the SET_WALLPAPER permission"
* commit '978cfc39a10e1b95f9d6dfb5c8e9eb58a10ce0ec':
SystemUI needs the SET_WALLPAPER permission
Diffstat (limited to 'packages/SystemUI')
| -rw-r--r-- | packages/SystemUI/AndroidManifest.xml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/packages/SystemUI/AndroidManifest.xml b/packages/SystemUI/AndroidManifest.xml index b606a6f..226a8ca 100644 --- a/packages/SystemUI/AndroidManifest.xml +++ b/packages/SystemUI/AndroidManifest.xml @@ -104,6 +104,9 @@ <uses-permission android:name="android.permission.ACCESS_KEYGUARD_SECURE_STORAGE" /> <uses-permission android:name="android.permission.TRUST_LISTENER" /> + <!-- Needed for WallpaperManager.clear in ImageWallpaper.updateWallpaperLocked --> + <uses-permission android:name="android.permission.SET_WALLPAPER"/> + <!-- Recents --> <uses-permission android:name="android.permission.BIND_APPWIDGET" /> |