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

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

Browse Source
This commit is contained in:
Lucas Dupin
2021-09-14 15:14:19 +00:00
committed by Android (Google) Code Review
parent 3eac9fde24 db4dce333d
commit d4468037c7
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -562,7 +562,7 @@ public class WallpaperManager {
} }
if (returnDefault) { if (returnDefault) {
Bitmap defaultWallpaper = mDefaultWallpaper; Bitmap defaultWallpaper = mDefaultWallpaper;
if (defaultWallpaper == null) { if (defaultWallpaper == null || defaultWallpaper.isRecycled()) {
defaultWallpaper = getDefaultWallpaper(context, which); defaultWallpaper = getDefaultWallpaper(context, which);
synchronized (this) { synchronized (this) {
mDefaultWallpaper = defaultWallpaper; mDefaultWallpaper = defaultWallpaper;