From 1c827da635732826136bf75046e968cbb4554acf Mon Sep 17 00:00:00 2001 From: Christopher Tate Date: Wed, 2 May 2018 13:18:35 -0700 Subject: [PATCH] Just drop the default WP bitmap, don't explicitly recycle it Recycling invalidates it out from under any client code that might have retained the reference previously. That's not sociable. Just drop the internal cache reference. The underlying storage will be properly freed by GC if it's genuinely not being used anywhere else. Change-Id: I94e0e2ba2b78daa40c8026e6fc72fda3bed57ae3 Fixes: 79108131 Bug: 74534423 Test: atest android.content.cts.ContextWrapperTest#testAccessWallpaper --- core/java/android/app/WallpaperManager.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/core/java/android/app/WallpaperManager.java b/core/java/android/app/WallpaperManager.java index 6c2fb2dfebe54..fde756c13234c 100644 --- a/core/java/android/app/WallpaperManager.java +++ b/core/java/android/app/WallpaperManager.java @@ -442,9 +442,6 @@ public class WallpaperManager { synchronized (this) { mCachedWallpaper = null; mCachedWallpaperUserId = 0; - if (mDefaultWallpaper != null) { - mDefaultWallpaper.recycle(); - } mDefaultWallpaper = null; } }