Merge "Don't stomp live wallpapers when tidying up imagery" into nyc-dev (63a95b0d) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/wallpaper/WallpaperManagerService.java

+21 −7

Original line number	Diff line number	Diff line
		@@ -730,14 +730,28 @@ public class WallpaperManagerService extends IWallpaperManager.Stub {
		public void systemRunning() {
		if (DEBUG) Slog.v(TAG, "systemReady");
		WallpaperData wallpaper = mWallpaperMap.get(UserHandle.USER_SYSTEM);
		// If we think we're going to be using the system image wallpaper imagery, make
		// sure we have something to render
		if (mImageWallpaper.equals(wallpaper.nextWallpaperComponent)) {
		// No crop file? Make sure we've finished the processing sequence if necessary
		if (!wallpaper.cropExists()) {
		if (DEBUG) {
		Slog.i(TAG, "No crop; regenerating from source");
		}
		generateCrop(wallpaper);
		}
		// Still nothing? Fall back to default.
		if (!wallpaper.cropExists()) {
		if (DEBUG) {
		Slog.i(TAG, "Unable to regenerate crop; resetting");
		}
		clearWallpaperLocked(false, FLAG_SET_SYSTEM, UserHandle.USER_SYSTEM, null);
		}
		} else {
		if (DEBUG) {
		Slog.i(TAG, "Nondefault wallpaper component; gracefully ignoring");
		}
		}
		switchWallpaper(wallpaper, null);
		wallpaper.wallpaperObserver = new WallpaperObserver(wallpaper);
		wallpaper.wallpaperObserver.startWatching();