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

Commit c3596302 authored by Simon Wingrove's avatar Simon Wingrove Committed by Automerger Merge Worker
Browse files

Merge "Don't trampoline twice when opening security or privacy" into... 

Merge "Don't trampoline twice when opening security or privacy" into tm-qpr-dev am: 062b18c7 am: cf14410f

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20209765



Change-Id: I457654172b46fff1b1059a8058894caad3021e80
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 99698c34 cf14410f

src/com/android/settings/Settings.java

+10 −0
Original line number Diff line number Diff line
@@ -158,6 +158,11 @@ public class Settings extends SettingsActivity { 
        /** Redirects to SafetyCenter if enabled. */

        @VisibleForTesting

        public void handleSafetyCenterRedirection() {

            if (isFinishing()) {

                // Don't trampoline if already exiting this activity.

                return;

            }



            if (SafetyCenterManagerWrapper.get().isEnabled(this)) {

                try {

                    startActivity(new Intent(Intent.ACTION_SAFETY_CENTER));
@@ -219,6 +224,11 @@ public class Settings extends SettingsActivity { 
        /** Redirects to SafetyCenter if enabled. */

        @VisibleForTesting

        public void handleSafetyCenterRedirection() {

            if (isFinishing()) {

                // Don't trampoline if already exiting this activity.

                return;

            }



            if (ACTION_PRIVACY_SETTINGS.equals(getIntent().getAction())

                    && SafetyCenterManagerWrapper.get().isEnabled(this)) {

                try {