commit d886a33f4a966318d87abdc3f84421745f08015a
author Eric Arseneau <earseneau@google.com> Mon Dec 06 14:37:01 2021 -0800
committer Eric Arseneau <earseneau@google.com> Mon Dec 06 14:37:01 2021 -0800
tree 258c59db8cfe672ee4a4a5225ebf139e1d6a0ce6
parent 3cb93d3b15e31a6c4c1c5409d2b7677c94db7410
parent b71084a7619aada67dd8d66a55b7e99e5910cafd

Merge mpr-2021-11-05

Change-Id: Idecb426323285532c211cf56469f0d03b3d3f94c

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.