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

Merge "Fix exception caused by system app setting wallpaper" am: aa33e703e4 am: 2b40eb9426

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

Change-Id: I5f3ef8b564e82f54fc63a3c42c005c67a70f9acd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Lucas Dupin
2022-09-09 22:17:20 +00:00
committed by Automerger Merge Worker
parent 65a9cd6b95 2b40eb9426
commit 62f11f571f
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2713,6 +2713,13 @@ public class WallpaperManagerService extends IWallpaperManager.Stub
checkPermission(android.Manifest.permission.SET_WALLPAPER_DIM_AMOUNT); checkPermission(android.Manifest.permission.SET_WALLPAPER_DIM_AMOUNT);
synchronized (mLock) { synchronized (mLock) {
WallpaperData data = mWallpaperMap.get(mCurrentUserId); WallpaperData data = mWallpaperMap.get(mCurrentUserId);
if (data == null) {
data = mWallpaperMap.get(UserHandle.USER_SYSTEM);
if (data == null) {
Slog.e(TAG, "getWallpaperDimAmount: wallpaperData is null");
return 0.0f;
}
}
return data.mWallpaperDimAmount; return data.mWallpaperDimAmount;
} }
} }