summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlijilou <lijilou@xiaomi.corp-partner.google.com>2024-05-04 13:46:20 +0800
committerJilou li <lijilou@xiaomi.corp-partner.google.com>2024-05-04 12:25:09 +0000
commit775c16290be3ee613b25ed050cf86bc0683663a7 (patch)
tree8c4b719c8046b73c407ee43ad6c1463f0fe03e0a
parent2949179fa0be36238d850fce5d3357b7836f4918 (diff)
downloadbase-775c16290be3ee613b25ed050cf86bc0683663a7.tar.gz
WallpaperManagerService:fix NPE happen in onDisplayReadyInternal method .
Bug: 338661733 Change-Id: I04ce021ef7838f0574875359daeb8c765d5f6a09
-rw-r--r--services/core/java/com/android/server/wallpaper/WallpaperManagerService.java3
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;