Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "wallpaper: fix null service manager registered to server" into udc-dev am: ff9f72716d

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23117499

Change-Id: I1a3e19e6a28cf377ba95cb87ad4533ee3938cacf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Lucas Dupin
2023-05-11 03:47:56 +00:00
committed by Automerger Merge Worker
parent cca91b17fe ff9f72716d
commit 818e63beb3
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/wallpaper/WallpaperDataParser.java
View File

@@ -38,6 +38,7 @@ import android.content.pm.PackageManager;
import android.content.res.Resources; import android.content.res.Resources;
import android.graphics.Color; import android.graphics.Color;
import android.os.FileUtils; import android.os.FileUtils;
import android.os.SystemProperties;
import android.util.Slog; import android.util.Slog;
import android.util.SparseArray; import android.util.SparseArray;
import android.util.Xml; import android.util.Xml;
@@ -85,8 +86,8 @@ class WallpaperDataParser {
mWallpaperCropper = wallpaperCropper; mWallpaperCropper = wallpaperCropper;
mImageWallpaper = ComponentName.unflattenFromString( mImageWallpaper = ComponentName.unflattenFromString(
context.getResources().getString(R.string.image_wallpaper_component)); context.getResources().getString(R.string.image_wallpaper_component));
mIsLockscreenLiveWallpaperEnabled = context.getSystemService(WallpaperManager.class) mIsLockscreenLiveWallpaperEnabled =
.isLockscreenLiveWallpaperEnabled(); SystemProperties.getBoolean("persist.wm.debug.lockscreen_live_wallpaper", false);
} }
private JournaledFile makeJournaledFile(int userId) { private JournaledFile makeJournaledFile(int userId) {