diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2017-08-29 23:47:50 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-08-29 23:47:50 +0000 |
| commit | a050d6302f335103d70a4cc7875601dfc7b4d2cd (patch) | |
| tree | 65aa8d1435f9277637995e81ae97aba42eee563d /core/java | |
| parent | 3390511e17baed8be081fddf7f51780b6539339e (diff) | |
| parent | 11620edf31ac03bef0e26d062d67ae731379dee8 (diff) | |
Merge "Note cross-user permission requirement for relevant wallpaper operations" into oc-mr1-dev
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/app/WallpaperManager.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/core/java/android/app/WallpaperManager.java b/core/java/android/app/WallpaperManager.java index b9e739755921..942cc99585ed 100644 --- a/core/java/android/app/WallpaperManager.java +++ b/core/java/android/app/WallpaperManager.java @@ -1603,11 +1603,12 @@ public class WallpaperManager { /** * Clear the wallpaper for a specific user. The caller must hold the * INTERACT_ACROSS_USERS_FULL permission to clear another user's - * wallpaper. + * wallpaper, and must hold the SET_WALLPAPER permission in all + * circumstances. * @hide */ @SystemApi - @RequiresPermission(android.Manifest.permission.SET_WALLPAPER) + @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS_FULL) public void clearWallpaper(@SetWallpaperFlags int which, int userId) { if (sGlobals.mService == null) { Log.w(TAG, "WallpaperService not running"); |