Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Aurélien Pomini
2023-05-26 10:07:37 +00:00
committed by Android (Google) Code Review
parent 8aede728ac 169a306c2e
commit 741afeca21
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/java/com/android/server/wm/ActivityTaskManagerService.java
View File

@@ -3560,10 +3560,10 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub {
mRootWindowContainer.forAllDisplays(displayContent -> { mRootWindowContainer.forAllDisplays(displayContent -> {
mKeyguardController.keyguardGoingAway(displayContent.getDisplayId(), flags); mKeyguardController.keyguardGoingAway(displayContent.getDisplayId(), flags);
}); });
WallpaperManagerInternal wallpaperManagerInternal = getWallpaperManagerInternal(); }
if (wallpaperManagerInternal != null) { WallpaperManagerInternal wallpaperManagerInternal = getWallpaperManagerInternal();
wallpaperManagerInternal.onKeyguardGoingAway(); if (wallpaperManagerInternal != null) {
} wallpaperManagerInternal.onKeyguardGoingAway();
} }
} finally { } finally {
Binder.restoreCallingIdentity(token); Binder.restoreCallingIdentity(token);