diff options
author | Aurélien Pomini <pomini@google.com> | 2024-05-07 15:51:01 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-05-07 15:51:01 +0000 |
commit | 7e24581cd9c5ab739651ab8d434eddd22255a109 (patch) | |
tree | 405678fc9b94dc81d0900b47dceca307817d1b46 | |
parent | f4d84e1a293402e054afde5a1d8efbc8236f51ea (diff) | |
parent | 775c16290be3ee613b25ed050cf86bc0683663a7 (diff) | |
download | base-7e24581cd9c5ab739651ab8d434eddd22255a109.tar.gz |
Merge "WallpaperManagerService:fix NPE happen in onDisplayReadyInternal method ." into main
-rw-r--r-- | services/core/java/com/android/server/wallpaper/WallpaperManagerService.java | 3 |
1 files changed, 2 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 1485b961789c..231ca5af9c20 100644 --- a/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java +++ b/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java @@ -3436,7 +3436,8 @@ public class WallpaperManagerService extends IWallpaperManager.Stub } // System wallpaper does not support multiple displays, attach this display to // the fallback wallpaper. - if (mFallbackWallpaper != null) { + if (mFallbackWallpaper != null && mFallbackWallpaper + .connection != null) { final DisplayConnector connector = mFallbackWallpaper .connection.getDisplayConnectorOrCreate(displayId); if (connector == null) return; |