Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix WallpaperManager APIs" am: 73e89cd290 am: 6e1400f43f

Browse Source 
am: 2cc80a362a

Change-Id: I57bc74595d92a6c1bfe0d2c9cc75e442723c4f4c
This commit is contained in:
Chris Tate
2016-09-21 20:47:24 +00:00
committed by android-build-merger
parent 307572149f 2cc80a362a
commit a03b5be55c
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/app/WallpaperManager.java
View File

@@ -910,7 +910,7 @@ public class WallpaperManager {
* wallpaper.
*/
public void setResource(@RawRes int resid) throws IOException {
setResource(resid, FLAG_SYSTEM);
setResource(resid, FLAG_SYSTEM | FLAG_LOCK);
}
/**
@@ -1016,7 +1016,7 @@ public class WallpaperManager {
*/
public int setBitmap(Bitmap fullImage, Rect visibleCropHint, boolean allowBackup)
throws IOException {
return setBitmap(fullImage, visibleCropHint, allowBackup, FLAG_SYSTEM);
return setBitmap(fullImage, visibleCropHint, allowBackup, FLAG_SYSTEM | FLAG_LOCK);
}
/**
@@ -1154,7 +1154,7 @@ public class WallpaperManager {
*/
public int setStream(InputStream bitmapData, Rect visibleCropHint, boolean allowBackup)
throws IOException {
return setStream(bitmapData, visibleCropHint, allowBackup, FLAG_SYSTEM);
return setStream(bitmapData, visibleCropHint, allowBackup, FLAG_SYSTEM | FLAG_LOCK);
}
/**
@@ -1393,7 +1393,7 @@ public class WallpaperManager {
*/
@SystemApi
public void clearWallpaper() {
clearWallpaper(FLAG_SYSTEM, mContext.getUserId());
clearWallpaper(FLAG_SYSTEM | FLAG_LOCK, mContext.getUserId());
}
/**