Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2b40eb94 authored by Lucas Dupin's avatar Lucas Dupin Committed by Automerger Merge Worker
Browse files

Merge "Fix exception caused by system app setting wallpaper" am: aa33e703 

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



Change-Id: Ic27f5ae950d45db66154cb0cad825de3c863db46
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e83594d4 aa33e703

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

+7 −0
Original line number Diff line number Diff line
@@ -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;

        }

    }