commit d54bf3f795eaff726fdbd648edf8e10cc5cf05c4
author George Lin <giolin@google.com> Fri Aug 25 14:57:34 2023 +0000
committer George Lin <giolin@google.com> Fri Aug 25 14:59:36 2023 +0000
tree 3556555be0c494a22ca8cc10f372efca79941934
parent 6f01c4cd4018d92738be588b404a83cd2e1cc7b9

Fix recent wallpaper for home not working (1/2)

We NEED to pass a non-empty ID for Google Photos images.

Test: Manually tested that recent wallpaper shows
Bug: 297423511
Change-Id: I2297b1f8396fe5d0eb89bb33b672ee742eb75e0c

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

diff --git a/src/com/android/wallpaper/module/DefaultWallpaperPersister.java b/src/com/android/wallpaper/module/DefaultWallpaperPersister.java
index 7aef5eb..12c6718 100755
--- a/src/com/android/wallpaper/module/DefaultWallpaperPersister.java
+++ b/src/com/android/wallpaper/module/DefaultWallpaperPersister.java
@@ -714,8 +714,10 @@
             mWallpaperPreferences.setHomeWallpaperCollectionId(
                     mWallpaper.getCollectionId(mAppContext));
             mWallpaperPreferences.setHomeWallpaperRemoteId(mWallpaper.getWallpaperId());
-            mWallpaperPreferences.storeLatestWallpaper(FLAG_SYSTEM,
-                    mWallpaper.getWallpaperId(),
+            // Wallpaper ID can not be null or empty to save to the recent wallpaper as preferences
+            String recentWallpaperId = TextUtils.isEmpty(mWallpaper.getWallpaperId())
+                    ? String.valueOf(bitmapHash) : mWallpaper.getWallpaperId();
+            mWallpaperPreferences.storeLatestWallpaper(FLAG_SYSTEM, recentWallpaperId,
                     mWallpaper, mBitmap, colors);
         }