commit a5cab7b8dce30cadf4976f9459fe740200c54d22
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Fri Jun 21 15:50:42 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jun 21 15:50:42 2024 +0000
tree e77c7d0412efa8d05bade68ca3cc09f0d01c279d
parent c4d930b0dc540ba167f8a6f9a2055c6ee390e34c
parent 753db8ac5ca3e42b3b8c890d1eef59f35d811b37

Merge "WallpaperManagerService:fix potential null pointer exception in onDisplayRemoved method." into main

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

diff --git a/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java b/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java
index e7565ee..45ea2db3 100644
--- a/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java
+++ b/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java
@@ -629,9 +629,12 @@
             synchronized (mLock) {
                 if (mLastWallpaper != null) {
                     WallpaperData targetWallpaper = null;
-                    if (mLastWallpaper.connection.containsDisplay(displayId)) {
+                    if (mLastWallpaper.connection != null &&
+                            mLastWallpaper.connection.containsDisplay(displayId)) {
                         targetWallpaper = mLastWallpaper;
-                    } else if (mFallbackWallpaper.connection.containsDisplay(displayId)) {
+                    } else if (mFallbackWallpaper != null &&
+                            mFallbackWallpaper.connection != null &&
+                            mFallbackWallpaper.connection.containsDisplay(displayId)) {
                         targetWallpaper = mFallbackWallpaper;
                     }
                     if (targetWallpaper == null) return;