am b42baaa8: am 978cfc39: Merge "SystemUI needs the SET_WALLPAPER permission"

* commit 'b42baaa829be7efa692088e97a44712daecbf5f4':
  SystemUI needs the SET_WALLPAPER permission
This commit is contained in:
Michael Wright
2015-03-23 16:02:24 +00:00
committed by Android Git Automerger

View File

@ -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" />