Merge "Prevent WallpaperManager#getBitmap return recycled bitmap." into sc-v2-dev am: d4468037c7 am: e386c935ab
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15824230 Change-Id: I55a0ab040e92f809731a22b7c967768eaae3e7d2
This commit is contained in:
@@ -563,7 +563,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;
|
||||
|
||||
Reference in New Issue
Block a user