Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cc58dca2 authored by Chris Poultney's avatar Chris Poultney
Browse files

Adds a null check for an unlikely static wallpaper migration failure 

Fixes: b/318774182
Test: manually tested migration of static wallpaper
Flag: NONE
Change-Id: I4199d4c8f8cbf64da79826dfe78f49b8695a5a08
parent 36bfc0d7

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

+1 −1
Original line number Diff line number Diff line
@@ -1256,7 +1256,7 @@ public class WallpaperManagerService extends IWallpaperManager.Stub 
                        // migrateStaticSystemToLockWallpaperLocked() and added to the lock wp map

                        // if successful.

                        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

                            if (DEBUG) {

                                Slog.v(TAG, "static system+lock to system success");