summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Chris Poultney <poultney@google.com> 2024-01-18 15:40:46 +0000
committer Chris Poultney <poultney@google.com> 2024-01-18 15:40:46 +0000
commitcc58dca2704225f4fdf68908fab421e3a90d7073 (patch)
treeb96d70968aad30aefeee87e3dc690607d0cd5317
parent36bfc0d7531d93826b0349b8c0062f94a91a7eb9 (diff)
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
-rw-r--r--services/core/java/com/android/server/wallpaper/WallpaperManagerService.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java b/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java
index 3782b429f93a..26584315f15c 100644
--- a/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java
+++ b/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java
@@ -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");