Merge \\"Turn down factory-default lock wallpaper support\\" into nyc-dev am: 52e323bd38

am: 4676cc96ac Change-Id: I14d78f7d229c3691c11462c0e293219603f1ef2e
2016-06-09 22:16:39 +00:00
parent 5cdb347384 4676cc96ac
commit 3b2e584686
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;