Merge "Make sure PRIVACY_CONTROLS redirects to appropriate place." into udc-mainline-prod

1 files changed, 12 insertions, 1 deletions

diff --git a/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/SafetyCenterActivity.java b/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/SafetyCenterActivity.java
index c012a0264..5a5245068 100644
--- a/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/SafetyCenterActivity.java
+++ b/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/SafetyCenterActivity.java
@@ -37,6 +37,7 @@ import android.safetycenter.SafetyCenterManager;
 import android.safetycenter.config.SafetyCenterConfig;
 import android.safetycenter.config.SafetySource;
 import android.safetycenter.config.SafetySourcesGroup;
+import android.text.TextUtils;
 import android.util.Log;
 
 import androidx.annotation.Nullable;
@@ -149,13 +150,23 @@ public final class SafetyCenterActivity extends CollapsingToolbarBaseActivity {
         if (mSafetyCenterManager == null || !mSafetyCenterManager.isSafetyCenterEnabled()) {
             Log.w(TAG, "Safety Center disabled, redirecting to settings page");
             startActivity(
-                    new Intent(Settings.ACTION_SETTINGS).addFlags(FLAG_ACTIVITY_FORWARD_RESULT));
+                    new Intent(getActionToRedirectWhenDisabled())
+                            .addFlags(FLAG_ACTIVITY_FORWARD_RESULT));
             finish();
             return true;
         }
         return false;
     }
 
+    private String getActionToRedirectWhenDisabled() {
+        boolean isPrivacyControls =
+                TextUtils.equals(getIntent().getAction(), PRIVACY_CONTROLS_ACTION);
+        if (isPrivacyControls) {
+            return Settings.ACTION_PRIVACY_SETTINGS;
+        }
+        return Settings.ACTION_SETTINGS;
+    }
+
     private boolean maybeRedirectIntoTwoPaneSettings() {
         return shouldUseTwoPaneSettings() && tryRedirectTwoPaneSettings();
     }