Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 17399d0e authored by Anton Potapov's avatar Anton Potapov Committed by Android (Google) Code Review
Browse files

Merge "Dont enforce FLAG_ACTIVITY_CLEAR_TOP when FLAG_ACTIVITY_REORDER_TO_FRONT is set" into main

parents 13aa3806 189b5da2

packages/SystemUI/src/com/android/systemui/statusbar/phone/LegacyActivityStarterInternalImpl.kt

+6 −1
Original line number Diff line number Diff line
@@ -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(