Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 65a5c603 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix NPE causing CTS test failure" into udc-dev am: 8e4a7e8b am: 017752b1 

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



Change-Id: I566e5df754ba47500cf389bd0a9a701f4e57ac7d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8f328f06 017752b1

core/java/android/app/WallpaperManager.java

+5 −1
Original line number Diff line number Diff line
@@ -822,6 +822,10 @@ public class WallpaperManager { 
     */

    @TestApi

    public boolean isLockscreenLiveWallpaperEnabled() {

        return isLockscreenLiveWallpaperEnabledHelper();

    }



    private static boolean isLockscreenLiveWallpaperEnabledHelper() {

        if (sGlobals == null) {

            sIsLockscreenLiveWallpaperEnabled = SystemProperties.getBoolean(

                    "persist.wm.debug.lockscreen_live_wallpaper", false);
@@ -2756,7 +2760,7 @@ public class WallpaperManager { 
    public static InputStream openDefaultWallpaper(Context context, @SetWallpaperFlags int which) {

        final String whichProp;

        final int defaultResId;

        if (which == FLAG_LOCK && !sIsLockscreenLiveWallpaperEnabled) {

        if (which == FLAG_LOCK && !isLockscreenLiveWallpaperEnabledHelper()) {

            /* Factory-default lock wallpapers are not yet supported

            whichProp = PROP_LOCK_WALLPAPER;

            defaultResId = com.android.internal.R.drawable.default_lock_wallpaper;