Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Chris Tate
2016-06-09 22:06:59 +00:00
committed by Android (Google) Code Review
parent 9e9c78f8ce 36cb2a7a91
commit 52e323bd38
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/app/WallpaperManager.java
View File

@@ -1576,8 +1576,11 @@ public class WallpaperManager {
final String whichProp; final String whichProp;
final int defaultResId; final int defaultResId;
if (which == FLAG_LOCK) { if (which == FLAG_LOCK) {
/* Factory-default lock wallpapers are not yet supported
whichProp = PROP_LOCK_WALLPAPER; whichProp = PROP_LOCK_WALLPAPER;
defaultResId = com.android.internal.R.drawable.default_lock_wallpaper; defaultResId = com.android.internal.R.drawable.default_lock_wallpaper;
*/
return null;
} else { } else {
whichProp = PROP_WALLPAPER; whichProp = PROP_WALLPAPER;
defaultResId = com.android.internal.R.drawable.default_wallpaper; defaultResId = com.android.internal.R.drawable.default_wallpaper;