Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit af2353eb authored by Lucas Dupin's avatar Lucas Dupin Committed by Automerger Merge Worker
Browse files

Merge "Prevent WallpaperManager#getBitmap return recycled bitmap." into... 

Merge "Prevent WallpaperManager#getBitmap return recycled bitmap." into sc-v2-dev am: d4468037 am: e386c935

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15824230

Change-Id: I55a0ab040e92f809731a22b7c967768eaae3e7d2
parents 7a37c8bd e386c935

core/java/android/app/WallpaperManager.java

+1 −1
Original line number Diff line number Diff line
@@ -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;