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

Commit be469f12 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge "Merge "NO PARTIAL RERUN: Do not return recycled bitmaps" into pi-dev... 

Merge "Merge "NO PARTIAL RERUN: Do not return recycled bitmaps" into pi-dev am: 6f34a9b2 am: adf468be"
parents 57ffac7f 972a1388

core/java/android/app/WallpaperManager.java

+2 −1
Original line number Diff line number Diff line
@@ -401,7 +401,8 @@ public class WallpaperManager { 
                }

            }

            synchronized (this) {

                if (mCachedWallpaper != null && mCachedWallpaperUserId == userId) {

                if (mCachedWallpaper != null && mCachedWallpaperUserId == userId

                        && !mCachedWallpaper.isRecycled()) {

                    return mCachedWallpaper;

                }

                mCachedWallpaper = null;

packages/SystemUI/src/com/android/systemui/ImageWallpaper.java

+1 −7
Original line number Diff line number Diff line
@@ -444,13 +444,7 @@ public class ImageWallpaper extends WallpaperService { 
            final Surface surface = getSurfaceHolder().getSurface();

            surface.hwuiDestroy();



            mLoader = new AsyncTask<Void, Void, Bitmap>() {

                @Override

                protected Bitmap doInBackground(Void... params) {

            mWallpaperManager.forgetLoadedWallpaper();

                    return null;

                }

            }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);

        }



        private void scheduleUnloadWallpaper() {