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

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

Merge "Fix WallpaperManagerInternal NPE" into udc-dev am: 8977208b am: ec0bc133 

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



Change-Id: I9b76f2db193931e51492c328316a0e29afb70e3d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 91a5ce30 ec0bc133

services/core/java/com/android/server/wm/ActivityTaskManagerService.java

+4 −1
Original line number Diff line number Diff line
@@ -3555,7 +3555,10 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { 
                mRootWindowContainer.forAllDisplays(displayContent -> {

                    mKeyguardController.keyguardGoingAway(displayContent.getDisplayId(), flags);

                });

                getWallpaperManagerInternal().onKeyguardGoingAway();

                WallpaperManagerInternal wallpaperManagerInternal = getWallpaperManagerInternal();

                if (wallpaperManagerInternal != null) {

                    wallpaperManagerInternal.onKeyguardGoingAway();

                }

            }

        } finally {

            Binder.restoreCallingIdentity(token);