commit c359630286a54e371b707ded25ee87ef4fc38b81
author Simon Wingrove <simonjw@google.com> Wed Oct 19 09:50:59 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Oct 19 09:50:59 2022 +0000
tree 7fac124d190b26578337acd518fa987d4820ad4f
parent 99698c344c35813015f95dfe28aeb67c41e1eb27
parent cf14410f5cd5d656fdceea2dd57724952f479702

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

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

Change-Id: I457654172b46fff1b1059a8058894caad3021e80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

src/com/android/settings/Settings.java

diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java
index 6cdf43f..53960b4 100644
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@ -158,6 +158,11 @@
         /** 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 @@
         /** 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 {