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

Commit cf14410f 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 tm-qpr-dev am: 062b18c7 

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



Change-Id: Ie86adb15224dc9052d6b017959b78114bbcb6a04
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6b628711 062b18c7

src/com/android/settings/Settings.java

+10 −0
Original line number Diff line number Diff line
@@ -152,6 +152,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));
@@ -213,6 +218,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 {