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

Merge "Always return the system default wallpaper with openDefaultWallpaper" into udc-dev

Browse Source
This commit is contained in:
Aurélien Pomini
2023-04-14 16:24:20 +00:00
committed by Android (Google) Code Review
parent 6ed2758673 7965f4d70a
commit 6eb6a5ca3d
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/java/android/app/WallpaperManager.java
View File

@@ -303,7 +303,7 @@ public class WallpaperManager {
private final Context mContext;
private final boolean mWcgEnabled;
private final ColorManagementProxy mCmProxy;
private Boolean mIsLockscreenLiveWallpaperEnabled = null;
private static Boolean sIsLockscreenLiveWallpaperEnabled = null;
/**
* Special drawable that draws a wallpaper as fast as possible. Assumes
@@ -823,18 +823,18 @@ public class WallpaperManager {
@TestApi
public boolean isLockscreenLiveWallpaperEnabled() {
if (sGlobals == null) {
mIsLockscreenLiveWallpaperEnabled = SystemProperties.getBoolean(
sIsLockscreenLiveWallpaperEnabled = SystemProperties.getBoolean(
"persist.wm.debug.lockscreen_live_wallpaper", false);
}
if (mIsLockscreenLiveWallpaperEnabled == null) {
if (sIsLockscreenLiveWallpaperEnabled == null) {
try {
mIsLockscreenLiveWallpaperEnabled =
sIsLockscreenLiveWallpaperEnabled =
sGlobals.mService.isLockscreenLiveWallpaperEnabled();
} catch (RemoteException e) {
throw e.rethrowFromSystemServer();
}
}
return mIsLockscreenLiveWallpaperEnabled;
return sIsLockscreenLiveWallpaperEnabled;
}
/**
@@ -2757,7 +2757,7 @@ public class WallpaperManager {
public static InputStream openDefaultWallpaper(Context context, @SetWallpaperFlags int which) {
final String whichProp;
final int defaultResId;
if (which == FLAG_LOCK) {
if (which == FLAG_LOCK && !sIsLockscreenLiveWallpaperEnabled) {
/* Factory-default lock wallpapers are not yet supported
whichProp = PROP_LOCK_WALLPAPER;
defaultResId = com.android.internal.R.drawable.default_lock_wallpaper;