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

Commit a5cab7b8 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

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

Merge "WallpaperManagerService:fix potential null pointer exception in onDisplayRemoved method." into main
parents c4d930b0 753db8ac

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

+5 −2
Original line number Diff line number Diff line
@@ -629,9 +629,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;