Merge "Fix exception caused by system app setting wallpaper"
This commit is contained in:
@@ -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;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user