commit 062b18c7365577937ea33cae445026214fb0a01a
author Simon Wingrove <simonjw@google.com> Wed Oct 19 08:32:10 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Oct 19 08:32:10 2022 +0000
tree 3cc68a97026d221df3291de81f3b2cb4bc62be0a
parent 3767112332b8d0bad7751f68e8b8d69549a422dc
parent 4884157649559076d9a362acae4529ef9c0925f8

Merge "Don't trampoline twice when opening security or privacy" into tm-qpr-dev

src/com/android/settings/Settings.java

diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java
index f1c1191..50ffdc7 100644
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@ -152,6 +152,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));
@@ -213,6 +218,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 {