From 22774720c8341b72abffb8d2817ea5fd7205db28 Mon Sep 17 00:00:00 2001
From: Chris Poultney <poultney@google.com>
Date: Tue, 14 Feb 2023 21:57:43 +0000
Subject: [PATCH] Fixes NPE in WallpaperData constructor

Bug: 253507223
Test: TreeHugger
Change-Id: Ibfa441ac83b20bd0efcc53acd19c81750cb65430
---
 .../core/java/com/android/server/wallpaper/WallpaperData.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/wallpaper/WallpaperData.java b/services/core/java/com/android/server/wallpaper/WallpaperData.java
index 67635148b424e..9ff6a0d7e6ee0 100644
--- 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