Merge "Fix exception caused by system app setting wallpaper"

2022-09-09 21:06:57 +00:00
parent eac4885894 00b7871466
commit aa33e703e4
1 changed files with 7 additions and 0 deletions
--- a/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java
+++ b/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java
@@ -2713,6 +2713,13 @@ public class WallpaperManagerService extends IWallpaperManager.Stub
        checkPermission(android.Manifest.permission.SET_WALLPAPER_DIM_AMOUNT);
        synchronized (mLock) {
            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;
        }
    }