Merge "Fixes NPE in WallpaperData constructor"

2023-02-15 05:00:25 +00:00
parent 53de211e64 22774720c8
commit 939b812edd
1 changed files with 3 additions and 1 deletions
--- a/services/core/java/com/android/server/wallpaper/WallpaperData.java
+++ b/services/core/java/com/android/server/wallpaper/WallpaperData.java
@@ -166,7 +166,9 @@ class WallpaperData {
        this.primaryColors = source.primaryColors;
        this.mWallpaperDimAmount = source.mWallpaperDimAmount;
        this.connection = source.connection;
-        this.connection.mWallpaper = this;
+        if (this.connection != null) {
+            this.connection.mWallpaper = this;
+        }
    }

    @Override