Merge "Release lock before color extraction on dim changes" into udc-qpr-dev (e3d66c38) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/wallpaper/WallpaperManagerService.java

+5 −1

Original line number	Diff line number	Diff line
		@@ -2895,6 +2895,7 @@ public class WallpaperManagerService extends IWallpaperManager.Stub
		checkPermission(android.Manifest.permission.SET_WALLPAPER_DIM_AMOUNT);
		final long ident = Binder.clearCallingIdentity();
		try {
		List<WallpaperData> pendingColorExtraction = new ArrayList<>();
		synchronized (mLock) {
		WallpaperData wallpaper = mWallpaperMap.get(mCurrentUserId);
		WallpaperData lockWallpaper = mLockWallpaperMap.get(mCurrentUserId);
		@@ -2930,7 +2931,7 @@ public class WallpaperManagerService extends IWallpaperManager.Stub
		// Need to extract colors again to re-calculate dark hints after
		// applying dimming.
		wp.mIsColorExtractedFromDim = true;
		notifyWallpaperColorsChanged(wp, wp.mWhich);
		pendingColorExtraction.add(wp);
		changed = true;
		}
		}
		@@ -2962,6 +2963,9 @@ public class WallpaperManagerService extends IWallpaperManager.Stub
		}
		}
		}
		for (WallpaperData wp: pendingColorExtraction) {
		notifyWallpaperColorsChanged(wp, wp.mWhich);
		}
		} finally {
		Binder.restoreCallingIdentity(ident);
		}