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

Commit 8e4a7e8b authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix NPE causing CTS test failure" into udc-dev

parents 0cdca7eb b7967656

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);
@@ -2757,7 +2761,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;