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

Commit 8977208b authored by Aurélien Pomini's avatar Aurélien Pomini Committed by Android (Google) Code Review
Browse files

Merge "Fix WallpaperManagerInternal NPE" into udc-dev

parents a30b77d0 c206441b

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);