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

Commit 96a71a86 authored by Aurélien Pomini's avatar Aurélien Pomini Committed by Automerger Merge Worker
Browse files

Merge "WallpaperManagerService:fix NPE happen in onDisplayReadyInternal method... 

Merge "WallpaperManagerService:fix NPE happen in onDisplayReadyInternal method ." into main am: 7e24581c

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



Change-Id: I7427e9a8572ac0dd64ad75ac658b3ab3545581c4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 959cc55b 7e24581c

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

+2 −1
Original line number Diff line number Diff line
@@ -3436,7 +3436,8 @@ public class WallpaperManagerService extends IWallpaperManager.Stub 
            }

            // System wallpaper does not support multiple displays, attach this display to

            // the fallback wallpaper.

            if (mFallbackWallpaper != null) {

            if (mFallbackWallpaper != null && mFallbackWallpaper

                        .connection != null) {

                final DisplayConnector connector = mFallbackWallpaper

                        .connection.getDisplayConnectorOrCreate(displayId);

                if (connector == null) return;