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

Merge "Clear ActivityRecord#mDismissKeyguard flag after app launches." into tm-qpr-dev

Browse Source
This commit is contained in:
Issei Suzuki
2022-06-14 12:21:57 +00:00
committed by Android (Google) Code Review
parent 5f5b5b959d 41cbf49af7
commit b82a6d8f36
2 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
services/core/java/com/android/server/wm/ActivityRecord.java
View File

@@ -7399,7 +7399,6 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
mTransit = TRANSIT_OLD_UNSET; mTransit = TRANSIT_OLD_UNSET;
mTransitFlags = 0; mTransitFlags = 0;
mNeedsAnimationBoundsLayer = false; mNeedsAnimationBoundsLayer = false;
mDismissKeyguard = false;
setAppLayoutChanges(FINISH_LAYOUT_REDO_ANIM | FINISH_LAYOUT_REDO_WALLPAPER, setAppLayoutChanges(FINISH_LAYOUT_REDO_ANIM | FINISH_LAYOUT_REDO_WALLPAPER,
"ActivityRecord"); "ActivityRecord");

1
services/core/java/com/android/server/wm/KeyguardController.java
View File

@@ -627,6 +627,7 @@ class KeyguardController {
} else if (top.canShowWhenLocked()) { } else if (top.canShowWhenLocked()) {
mTopOccludesActivity = top; mTopOccludesActivity = top;
} }
top.mDismissKeyguard = false;
// Only the top activity may control occluded, as we can't occlude the Keyguard // Only the top activity may control occluded, as we can't occlude the Keyguard
// if the top app doesn't want to occlude it. // if the top app doesn't want to occlude it.