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

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

Merge "Move onKeyguardGoingAway outside ActivityManager lock" into udc-dev am:... 

Merge "Move onKeyguardGoingAway outside ActivityManager lock" into udc-dev am: 741afeca am: 484fac37

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



Change-Id: Ie3d86b967616ab1867a1283287a278b2894b79a3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c01022bb 484fac37

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

        }