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

Commit f252ef9e authored by Christopher Tate's avatar Christopher Tate Committed by android-build-merger
Browse files

Merge \"Turn down factory-default lock wallpaper support\" into nyc-dev 

am: 52e323bd

Change-Id: I71646e6fb8a6996c17a9d2760aca88d6927d33ec
parents 3e03d02f 52e323bd

core/java/android/app/WallpaperManager.java

+3 −0
Original line number Diff line number Diff line
@@ -1576,8 +1576,11 @@ public class WallpaperManager { 
        final String whichProp;

        final int defaultResId;

        if (which == FLAG_LOCK) {

            /* Factory-default lock wallpapers are not yet supported

            whichProp = PROP_LOCK_WALLPAPER;

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

            */

            return null;

        } else {

            whichProp = PROP_WALLPAPER;

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