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

Commit dfcac562 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "WallpaperManagerService:fix potential null pointer exception in... 

Merge "WallpaperManagerService:fix potential null pointer exception in onDisplayRemoved method." into main am: a5cab7b8 am: a05ca86a

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



Change-Id: Idb272126827c072c852b33133b31f431ba6ae254
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5b40ba28 a05ca86a

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

+5 −2
Original line number Diff line number Diff line
@@ -650,9 +650,12 @@ public class WallpaperManagerService extends IWallpaperManager.Stub 
            synchronized (mLock) {

                if (mLastWallpaper != null) {

                    WallpaperData targetWallpaper = null;

                    if (mLastWallpaper.connection.containsDisplay(displayId)) {

                    if (mLastWallpaper.connection != null &&

                            mLastWallpaper.connection.containsDisplay(displayId)) {

                        targetWallpaper = mLastWallpaper;

                    } else if (mFallbackWallpaper.connection.containsDisplay(displayId)) {

                    } else if (mFallbackWallpaper != null &&

                            mFallbackWallpaper.connection != null &&

                            mFallbackWallpaper.connection.containsDisplay(displayId)) {

                        targetWallpaper = mFallbackWallpaper;

                    }

                    if (targetWallpaper == null) return;