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

Merge "Release lock before color extraction on dim changes" into udc-qpr-dev am: e3d66c3857

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24111946

Change-Id: I0482e481b114aa40b6661aac2df889763a6fecac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Aurélien Pomini
2023-07-25 10:40:20 +00:00
committed by Automerger Merge Worker
parent d55c003a47 e3d66c3857
commit f54661bf5a
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/wallpaper/WallpaperManagerService.java
View File

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