diff options
| author | 2024-04-25 13:38:10 +0100 | |
|---|---|---|
| committer | 2024-04-25 13:40:40 +0100 | |
| commit | 189b5da2b7901d03917dbcbb071e7dffe63368e3 (patch) | |
| tree | b0b968cf133c16b4097d3d191cd40003aeeb07ff | |
| parent | 1baa70a09b3defb2aa6fad65ad606bf50fd561fa (diff) | |
Dont enforce FLAG_ACTIVITY_CLEAR_TOP when FLAG_ACTIVITY_REORDER_TO_FRONT
is set
Flag: N/A
Test: atest ActivityStarterImplTest
Fixes: 331606825
Change-Id: I21c0796da6084e3535dc583f77d6aa21458eba6f
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/phone/LegacyActivityStarterInternalImpl.kt | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/LegacyActivityStarterInternalImpl.kt b/packages/SystemUI/src/com/android/systemui/statusbar/phone/LegacyActivityStarterInternalImpl.kt index 68d54e73774e..6b685118a462 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/LegacyActivityStarterInternalImpl.kt +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/LegacyActivityStarterInternalImpl.kt @@ -131,7 +131,12 @@ constructor( val runnable = Runnable { assistManagerLazy.get().hideAssist() - intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP + intent.flags = + if (intent.flags and Intent.FLAG_ACTIVITY_REORDER_TO_FRONT != 0) { + Intent.FLAG_ACTIVITY_NEW_TASK + } else { + Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP + } intent.addFlags(flags) val result = intArrayOf(ActivityManager.START_CANCELED) activityTransitionAnimator.startIntentWithAnimation( |