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

Merge "Fix WallpaperManager APIs"

Browse Source 
am: 73e89cd290

Change-Id: I6dd139e8ccb71e6c64141733f9de031b20694179
This commit is contained in:
Chris Tate
2016-09-21 20:34:49 +00:00
committed by android-build-merger
parent 337baf9d42 73e89cd290
commit 6e1400f43f
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

@@ -898,7 +898,7 @@ public class WallpaperManager {
* wallpaper.
*/
public void setResource(@RawRes int resid) throws IOException {
setResource(resid, FLAG_SYSTEM);
setResource(resid, FLAG_SYSTEM | FLAG_LOCK);
}
/**
@@ -1003,7 +1003,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);
}
/**
@@ -1128,7 +1128,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);
}
/**
@@ -1367,7 +1367,7 @@ public class WallpaperManager {
*/
@SystemApi
public void clearWallpaper() {
clearWallpaper(FLAG_SYSTEM, mContext.getUserId());
clearWallpaper(FLAG_SYSTEM | FLAG_LOCK, mContext.getUserId());
}
/**