Merge "DO NOT MERGE: Don't do heavy operation while in the synchronized block" into tm-dev (2f056bb1) · Commits · e / os / android_frameworks_base

core/java/android/app/WallpaperManager.java

+20 −18

Original line number	Diff line number	Diff line
		@@ -67,7 +67,6 @@ import android.os.ParcelFileDescriptor;
		import android.os.RemoteException;
		import android.os.StrictMode;
		import android.os.SystemProperties;
		import android.service.wallpaper.WallpaperService;
		import android.text.TextUtils;
		import android.util.ArrayMap;
		import android.util.ArraySet;
		@@ -559,10 +558,17 @@ public class WallpaperManager {
		}
		mCachedWallpaper = null;
		mCachedWallpaperUserId = 0;
		}
		try {
		mCachedWallpaper = getCurrentWallpaperLocked(
		Bitmap currentWallpaper = getCurrentWallpaperLocked(
		context, userId, hardware, cmProxy);
		if (currentWallpaper != null) {
		synchronized (this) {
		mCachedWallpaper = currentWallpaper;
		mCachedWallpaperUserId = userId;
		return mCachedWallpaper;
		}
		}
		} catch (OutOfMemoryError e) {
		Log.w(TAG, "Out of memory loading the current wallpaper: " + e);
		} catch (SecurityException e) {
		@@ -574,10 +580,6 @@ public class WallpaperManager {
		throw e;
		}
		}
		if (mCachedWallpaper != null) {
		return mCachedWallpaper;
		}
		}
		if (returnDefault) {
		Bitmap defaultWallpaper = mDefaultWallpaper;
		if (defaultWallpaper == null \|\| defaultWallpaper.isRecycled()) {
		@@ -2472,7 +2474,7 @@ public class WallpaperManager {
		*
		* @param colors Wallpaper color info, {@code null} when not available.
		* @param which A combination of {@link #FLAG_LOCK} and {@link #FLAG_SYSTEM}
		* @see WallpaperService.Engine#onComputeColors()
		* @see android.service.wallpaper.WallpaperService.Engine#onComputeColors()
		*/
		void onColorsChanged(@Nullable WallpaperColors colors, int which);

		@@ -2484,7 +2486,7 @@ public class WallpaperManager {
		* @param colors Wallpaper color info, {@code null} when not available.
		* @param which A combination of {@link #FLAG_LOCK} and {@link #FLAG_SYSTEM}
		* @param userId Owner of the wallpaper
		* @see WallpaperService.Engine#onComputeColors()
		* @see android.service.wallpaper.WallpaperService.Engine#onComputeColors()
		* @hide
		*/
		default void onColorsChanged(@Nullable WallpaperColors colors, int which, int userId) {