Merge "Prevent WallpaperManager#getBitmap return recycled bitmap." into sc-v2-dev

2021-09-14 15:14:19 +00:00
parent 3eac9fde24 db4dce333d
commit d4468037c7
1 changed files with 1 additions and 1 deletions
--- a/core/java/android/app/WallpaperManager.java
+++ b/core/java/android/app/WallpaperManager.java
@@ -562,7 +562,7 @@ public class WallpaperManager {
            }
            if (returnDefault) {
                Bitmap defaultWallpaper = mDefaultWallpaper;
-                if (defaultWallpaper == null) {
+                if (defaultWallpaper == null || defaultWallpaper.isRecycled()) {
                    defaultWallpaper = getDefaultWallpaper(context, which);
                    synchronized (this) {
                        mDefaultWallpaper = defaultWallpaper;