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

Merge changes from topic "cherrypick-setDismissKeyguard-sh5oh7kmyi" into tm-d1-dev am: aca8d31cc2

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

Change-Id: I39649b4bc0a574b7ff6d33dc396fca9b8e8ba280
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Issei Suzuki
2022-08-03 17:50:23 +00:00
committed by Automerger Merge Worker
parent 57b8f647ac aca8d31cc2
commit f0243591ec
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

@@ -7346,7 +7346,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

@@ -595,6 +595,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.