commit c359c7688d6a2fe916ad90f7e127ae8e2956858f
author Santiago Etchebehere <santie@google.com> Fri Aug 13 17:44:15 2021 -0700
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Aug 18 03:47:46 2021 +0000
tree 258c59db8cfe672ee4a4a5225ebf139e1d6a0ce6
parent 8113981a649ac967f648151d937c20e645c0f94e

Do not allow home screen only wallpaper if current is the default

Bug: 196171462
Test: manual (verify that destination dialog doesn't include
"Home Wallpaper" when the current is the default)

Change-Id: Ie6ef4e21855313c52a365f4ff10bf10be8128978
(cherry picked from commit 7742666ea743a2263c9d04bd2b8e1c288d768451)

src/com/android/wallpaper/module/WallpaperSetter.java

diff --git a/src/com/android/wallpaper/module/WallpaperSetter.java b/src/com/android/wallpaper/module/WallpaperSetter.java
index 9d5bb96..7f2be7c 100644
--- a/src/com/android/wallpaper/module/WallpaperSetter.java
+++ b/src/com/android/wallpaper/module/WallpaperSetter.java
@@ -21,6 +21,7 @@
 
 import com.android.wallpaper.R;
 import com.android.wallpaper.asset.Asset;
+import com.android.wallpaper.asset.BuiltInWallpaperAsset;
 import com.android.wallpaper.model.LiveWallpaperInfo;
 import com.android.wallpaper.model.WallpaperInfo;
 import com.android.wallpaper.module.UserEventLogger.WallpaperSetFailureReason;
@@ -302,7 +303,9 @@
             SetWallpaperDialogFragment setWallpaperDialog = new SetWallpaperDialogFragment();
             setWallpaperDialog.setTitleResId(titleResId);
             setWallpaperDialog.setListener(listenerWrapper);
-            if (homeWallpaper instanceof LiveWallpaperInfo && lockWallpaper == null) {
+            boolean isBuiltIn = homeWallpaper.getAsset(activity) instanceof BuiltInWallpaperAsset;
+            if ((homeWallpaper instanceof LiveWallpaperInfo || isBuiltIn)
+                    && lockWallpaper == null) {
                 if (isLiveWallpaper) {
                     // If lock wallpaper is live and we're setting a live wallpaper, we can only
                     // set it to both, so bypass the dialog.