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

2016-06-09 22:06:59 +00:00
parent 9e9c78f8ce 36cb2a7a91
commit 52e323bd38
1 changed files with 3 additions and 0 deletions
--- a/core/java/android/app/WallpaperManager.java
+++ b/core/java/android/app/WallpaperManager.java
@@ -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;