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

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

Browse Source 
am: 6f34a9b2d3

Change-Id: I2068bb87657abf2c36af2026b351122d2758f96d
This commit is contained in:
Lucas Dupin
2018-04-09 07:50:00 -07:00
committed by android-build-merger
parent 375f7260c4 6f34a9b2d3
commit adf468be06
2 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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;

8
packages/SystemUI/src/com/android/systemui/ImageWallpaper.java
View File

@@ -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);
mWallpaperManager.forgetLoadedWallpaper();
}
private void scheduleUnloadWallpaper() {