diff options
| author | Benjamin Franz <bfranz@google.com> | 2015-02-11 10:51:10 +0000 |
|---|---|---|
| committer | Benjamin Franz <bfranz@google.com> | 2015-03-09 10:39:21 +0000 |
| commit | f3ece36535d4999cf2bfd2175a33da6c3cdf298e (patch) | |
| tree | 3968fb249921a6e7cf86bead062f437991e44070 /api | |
| parent | b3ec733bb830f2d4425825d93f9ed95f284e9145 (diff) | |
| download | frameworks_base-f3ece36535d4999cf2bfd2175a33da6c3cdf298e.zip frameworks_base-f3ece36535d4999cf2bfd2175a33da6c3cdf298e.tar.gz frameworks_base-f3ece36535d4999cf2bfd2175a33da6c3cdf298e.tar.bz2 | |
Block setting wallpapers from managed profiles.
Silently fail when a managed profile app tries to change the
wallpaper and return default values for getters in that case.
This is implemented through a new AppOp that is controlled by
a new user restriction that will be set during provisioning.
Bug: 18725052
Change-Id: I1601852617e738be86560f054daf3435dd9f5a9f
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | api/system-current.txt | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index e6d8546..99d8fd4 100644 --- a/api/current.txt +++ b/api/current.txt @@ -5369,6 +5369,7 @@ package android.app { method public static android.app.WallpaperManager getInstance(android.content.Context); method public android.app.WallpaperInfo getWallpaperInfo(); method public boolean hasResourceWallpaper(int); + method public boolean isWallpaperSupported(); method public android.graphics.drawable.Drawable peekDrawable(); method public android.graphics.drawable.Drawable peekFastDrawable(); method public void sendWallpaperCommand(android.os.IBinder, java.lang.String, int, int, int, android.os.Bundle); diff --git a/api/system-current.txt b/api/system-current.txt index ca84133..21aee04 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -5460,6 +5460,7 @@ package android.app { method public static android.app.WallpaperManager getInstance(android.content.Context); method public android.app.WallpaperInfo getWallpaperInfo(); method public boolean hasResourceWallpaper(int); + method public boolean isWallpaperSupported(); method public android.graphics.drawable.Drawable peekDrawable(); method public android.graphics.drawable.Drawable peekFastDrawable(); method public void sendWallpaperCommand(android.os.IBinder, java.lang.String, int, int, int, android.os.Bundle); |