diff options
| author | 2022-08-03 17:50:23 +0000 | |
|---|---|---|
| committer | 2022-08-03 17:50:23 +0000 | |
| commit | f0243591ecde603d7232f29bfdf9ce6cde13fac3 (patch) | |
| tree | 0a29931299095db720385624593803134e1e5fae | |
| parent | 57b8f647ac3fb948bbf5914248f6e0b2c53da14b (diff) | |
| parent | aca8d31cc2e7aa402d2650e5bf0d71a3a6b3f0f5 (diff) | |
Merge changes from topic "cherrypick-setDismissKeyguard-sh5oh7kmyi" into tm-d1-dev am: aca8d31cc2
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>
| -rw-r--r-- | services/core/java/com/android/server/wm/ActivityRecord.java | 1 | ||||
| -rw-r--r-- | services/core/java/com/android/server/wm/KeyguardController.java | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/wm/ActivityRecord.java b/services/core/java/com/android/server/wm/ActivityRecord.java index ac44fd472ddc..6e7e31ad05c5 100644 --- a/services/core/java/com/android/server/wm/ActivityRecord.java +++ b/services/core/java/com/android/server/wm/ActivityRecord.java @@ -7346,7 +7346,6 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A mTransit = TRANSIT_OLD_UNSET; mTransitFlags = 0; mNeedsAnimationBoundsLayer = false; - mDismissKeyguard = false; setAppLayoutChanges(FINISH_LAYOUT_REDO_ANIM | FINISH_LAYOUT_REDO_WALLPAPER, "ActivityRecord"); diff --git a/services/core/java/com/android/server/wm/KeyguardController.java b/services/core/java/com/android/server/wm/KeyguardController.java index cf46126af488..a4c05eecdb07 100644 --- a/services/core/java/com/android/server/wm/KeyguardController.java +++ b/services/core/java/com/android/server/wm/KeyguardController.java @@ -595,6 +595,7 @@ class KeyguardController { } else if (top.canShowWhenLocked()) { mTopOccludesActivity = top; } + top.mDismissKeyguard = false; // Only the top activity may control occluded, as we can't occlude the Keyguard // if the top app doesn't want to occlude it. |