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

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

Merge "Move onKeyguardGoingAway outside ActivityManager lock" into udc-dev

parents 8aede728 169a306c

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

+4 −4
Original line number Diff line number Diff line
@@ -3560,11 +3560,11 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { 
                mRootWindowContainer.forAllDisplays(displayContent -> {

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

                });

            }

            WallpaperManagerInternal wallpaperManagerInternal = getWallpaperManagerInternal();

            if (wallpaperManagerInternal != null) {

                wallpaperManagerInternal.onKeyguardGoingAway();

            }

            }

        } finally {

            Binder.restoreCallingIdentity(token);

        }