From e1cc6f6a4f5e57ca3ec4f7b9cf0a83bd1a3aad73 Mon Sep 17 00:00:00 2001
From: Chen Bai <chenbai@google.com>
Date: Fri, 14 Apr 2023 06:23:56 +0000
Subject: [PATCH] wallpaper: fix null service manager registered to server

- Don't getService WallPaperManagerService within ctor.

BUG: 277380463
Change-Id: I4297ee0e39318b6ce11744b36fb1690a2e1e10ca
(cherry picked from commit 07871890903a38d6524d8db984bf21352b8646b5)
---
 .../com/android/server/wallpaper/WallpaperDataParser.java    | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/services/core/java/com/android/server/wallpaper/WallpaperDataParser.java b/services/core/java/com/android/server/wallpaper/WallpaperDataParser.java
index 53861c854a1b8..3e498d7d14ee4 100644
--- a/services/core/java/com/android/server/wallpaper/WallpaperDataParser.java
+++ b/services/core/java/com/android/server/wallpaper/WallpaperDataParser.java
@@ -38,6 +38,7 @@ import android.content.pm.PackageManager;
 import android.content.res.Resources;
 import android.graphics.Color;
 import android.os.FileUtils;
+import android.os.SystemProperties;
 import android.util.Slog;
 import android.util.SparseArray;
 import android.util.Xml;
@@ -85,8 +86,8 @@ class WallpaperDataParser {
         mWallpaperCropper = wallpaperCropper;
         mImageWallpaper = ComponentName.unflattenFromString(
                 context.getResources().getString(R.string.image_wallpaper_component));
-        mIsLockscreenLiveWallpaperEnabled = context.getSystemService(WallpaperManager.class)
-                .isLockscreenLiveWallpaperEnabled();
+        mIsLockscreenLiveWallpaperEnabled =
+                SystemProperties.getBoolean("persist.wm.debug.lockscreen_live_wallpaper", false);
     }
 
     private JournaledFile makeJournaledFile(int userId) {