Merge "Fix WallpaperManager APIs"

This commit is contained in:
Chris Tate
2016-09-21 20:26:00 +00:00
committed by Gerrit Code Review

View File

@@ -898,7 +898,7 @@ public class WallpaperManager {
* wallpaper. * wallpaper.
*/ */
public void setResource(@RawRes int resid) throws IOException { 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) public int setBitmap(Bitmap fullImage, Rect visibleCropHint, boolean allowBackup)
throws IOException { 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) public int setStream(InputStream bitmapData, Rect visibleCropHint, boolean allowBackup)
throws IOException { 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 @SystemApi
public void clearWallpaper() { public void clearWallpaper() {
clearWallpaper(FLAG_SYSTEM, mContext.getUserId()); clearWallpaper(FLAG_SYSTEM | FLAG_LOCK, mContext.getUserId());
} }
/** /**