Merge "Add logs to WallpaperManagerService when setting wallpaper" into rvc-dev (74fabfe5) · Commits · e / os / android_frameworks_base

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

+9 −8

Original line number	Original line	Diff line number	Diff line
	@@ -2441,9 +2441,8 @@ public class WallpaperManagerService extends IWallpaperManager.Stub
	* the caller here writes new bitmap data.		* the caller here writes new bitmap data.
	*/		*/
	if (which == FLAG_SYSTEM && mLockWallpaperMap.get(userId) == null) {		if (which == FLAG_SYSTEM && mLockWallpaperMap.get(userId) == null) {
	if (DEBUG) {		Slog.i(TAG, "Migrating current wallpaper to be lock-only before"
	Slog.i(TAG, "Migrating system->lock to preserve");		+ "updating system wallpaper");
	}
	migrateSystemToLockWallpaperLocked(userId);		migrateSystemToLockWallpaperLocked(userId);
	}		}

	@@ -2511,6 +2510,8 @@ public class WallpaperManagerService extends IWallpaperManager.Stub
	ParcelFileDescriptor fd = ParcelFileDescriptor.open(wallpaper.wallpaperFile,		ParcelFileDescriptor fd = ParcelFileDescriptor.open(wallpaper.wallpaperFile,
	MODE_CREATE\|MODE_READ_WRITE\|MODE_TRUNCATE);		MODE_CREATE\|MODE_READ_WRITE\|MODE_TRUNCATE);
	if (!SELinux.restorecon(wallpaper.wallpaperFile)) {		if (!SELinux.restorecon(wallpaper.wallpaperFile)) {
			Slog.w(TAG, "restorecon failed for wallpaper file: " +
			wallpaper.wallpaperFile.getPath());
	return null;		return null;
	}		}
	wallpaper.name = name;		wallpaper.name = name;
	@@ -2520,10 +2521,8 @@ public class WallpaperManagerService extends IWallpaperManager.Stub
	}		}
	// Nullify field to require new computation		// Nullify field to require new computation
	wallpaper.primaryColors = null;		wallpaper.primaryColors = null;
	if (DEBUG) {
	Slog.v(TAG, "updateWallpaperBitmapLocked() : id=" + wallpaper.wallpaperId		Slog.v(TAG, "updateWallpaperBitmapLocked() : id=" + wallpaper.wallpaperId
	+ " name=" + name + " file=" + wallpaper.wallpaperFile.getName());		+ " name=" + name + " file=" + wallpaper.wallpaperFile.getName());
	}
	return fd;		return fd;
	} catch (FileNotFoundException e) {		} catch (FileNotFoundException e) {
	Slog.w(TAG, "Error setting wallpaper", e);		Slog.w(TAG, "Error setting wallpaper", e);
	@@ -2556,7 +2555,7 @@ public class WallpaperManagerService extends IWallpaperManager.Stub
	WallpaperData wallpaper;		WallpaperData wallpaper;

	synchronized (mLock) {		synchronized (mLock) {
	if (DEBUG) Slog.v(TAG, "setWallpaperComponent name=" + name);		Slog.v(TAG, "setWallpaperComponent name=" + name);
	wallpaper = mWallpaperMap.get(userId);		wallpaper = mWallpaperMap.get(userId);
	if (wallpaper == null) {		if (wallpaper == null) {
	throw new IllegalStateException("Wallpaper not yet initialized for user " + userId);		throw new IllegalStateException("Wallpaper not yet initialized for user " + userId);
	@@ -2571,6 +2570,8 @@ public class WallpaperManagerService extends IWallpaperManager.Stub
	if (mLockWallpaperMap.get(userId) == null) {		if (mLockWallpaperMap.get(userId) == null) {
	// We're using the static imagery and there is no lock-specific image in place,		// We're using the static imagery and there is no lock-specific image in place,
	// therefore it's a shared system+lock image that we need to migrate.		// therefore it's a shared system+lock image that we need to migrate.
			Slog.i(TAG, "Migrating current wallpaper to be lock-only before"
			+ "updating system wallpaper");
	migrateSystemToLockWallpaperLocked(userId);		migrateSystemToLockWallpaperLocked(userId);
	}		}
	}		}