Don't trampoline to 2-pane Settings in xTS.

In automated testing, open SC activity directly and don't trampoline
into settings.  This reduces the amount of extraneuous code that is
running and reduces the likelihood of flakes caused by other product
changes.

Test: atest SafetyCenterSubpagesTest SafetyCenterStatusCardTest SafetyCenterQsActivityTest PrivacySubpageTest SafetyCenterActivityTest
Bug: 279327093
Change-Id: Iec404cca29a54751d87b83a7cbffb5de98653ae4

1 files changed, 8 insertions, 0 deletions

diff --git a/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/SafetyCenterActivity.java b/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/SafetyCenterActivity.java
index 9bfaa5f35..8f31da828 100644
--- a/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/SafetyCenterActivity.java
+++ b/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/SafetyCenterActivity.java
@@ -64,6 +64,8 @@ public final class SafetyCenterActivity extends CollapsingToolbarBaseActivity {
             "android.provider.extra.SETTINGS_EMBEDDED_DEEP_LINK_INTENT_URI";
     private static final String EXTRA_SETTINGS_EMBEDDED_DEEP_LINK_HIGHLIGHT_MENU_KEY =
             "android.provider.extra.SETTINGS_EMBEDDED_DEEP_LINK_HIGHLIGHT_MENU_KEY";
+    private static final String EXTRA_PREVENT_TRAMPOLINE_TO_SETTINGS =
+            "com.android.permissioncontroller.safetycenter.extra.PREVENT_TRAMPOLINE_TO_SETTINGS";
 
     private SafetyCenterManager mSafetyCenterManager;
 
@@ -145,6 +147,12 @@ public final class SafetyCenterActivity extends CollapsingToolbarBaseActivity {
         if (!ActivityEmbeddingUtils.isEmbeddingActivityEnabled(this)) {
             return false;
         }
+
+        Bundle extras = getIntent().getExtras();
+        if (extras != null && extras.getBoolean(EXTRA_PREVENT_TRAMPOLINE_TO_SETTINGS, false)) {
+            return false;
+        }
+
         return isTaskRoot() && !ActivityEmbeddingUtils.isActivityEmbedded(this);
     }