Merge "Adds a null check for an unlikely static wallpaper migration failure" into main (0c0cbbf4) · Commits · e / os / android_frameworks_base

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

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1256,7 +1256,7 @@ public class WallpaperManagerService extends IWallpaperManager.Stub
	// migrateStaticSystemToLockWallpaperLocked() and added to the lock wp map		// migrateStaticSystemToLockWallpaperLocked() and added to the lock wp map
	// if successful.		// if successful.
	WallpaperData lockWp = mLockWallpaperMap.get(mNewWallpaper.userId);		WallpaperData lockWp = mLockWallpaperMap.get(mNewWallpaper.userId);
	if (lockWp != null) {		if (lockWp != null && mOriginalSystem.connection != null) {
	// Successful rename, set old system+lock to the pending lock wp		// Successful rename, set old system+lock to the pending lock wp
	if (DEBUG) {		if (DEBUG) {
	Slog.v(TAG, "static system+lock to system success");		Slog.v(TAG, "static system+lock to system success");