Merge "Fix WallpaperManager APIs" into nyc-mr1-dev (7baf677d) · Commits · e / os / android_frameworks_base

core/java/android/app/WallpaperManager.java

+4 −4

Original line number	Diff line number	Diff line
		@@ -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());
		}

		/**