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

Commit b7967656 authored by Chris Poultney's avatar Chris Poultney
Browse files

Fix NPE causing CTS test failure 

Fixes: b/278329779
Test: this is the test
Change-Id: Ide8597be3f5dcae60442168032735a60d9ec332f
parent 3588c993

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;