From aecc94098743e9fcffbbb671fa130675a89fd17f Mon Sep 17 00:00:00 2001
From: songferngwang <songferngwang@google.com>
Date: Fri, 19 Apr 2024 07:44:22 +0000
Subject: [PATCH] Using the new sim ui when user insert psim

When device has two active esim and the user insert psim, the settings
will popup the dailog to ask user select the two sim card.
Now, there is the new sim UI, so it should show the new one.

Bug: 335780975
Test: verify UI
Change-Id: I298d488d467c447d6f8d91d86383708a4d1f70c9
---
 src/com/android/settings/network/SimOnboardingActivity.kt     | 1 +
 .../network/telephony/ToggleSubscriptionDialogActivity.java   | 1 +
 .../android/settings/sim/receivers/SimSlotChangeHandler.java  | 4 +---
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/com/android/settings/network/SimOnboardingActivity.kt b/src/com/android/settings/network/SimOnboardingActivity.kt
index eea72867728..481dc205f70 100644
--- a/src/com/android/settings/network/SimOnboardingActivity.kt
+++ b/src/com/android/settings/network/SimOnboardingActivity.kt
@@ -549,6 +549,7 @@ class SimOnboardingActivity : SpaBaseDialogActivity() {
             val intent = Intent(context, SimOnboardingActivity::class.java).apply {
                 putExtra(SUB_ID, subId)
             }
+            intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
             context.startActivity(intent)
         }
 
diff --git a/src/com/android/settings/network/telephony/ToggleSubscriptionDialogActivity.java b/src/com/android/settings/network/telephony/ToggleSubscriptionDialogActivity.java
index 6f4d3c3e390..78eb832bb3d 100644
--- a/src/com/android/settings/network/telephony/ToggleSubscriptionDialogActivity.java
+++ b/src/com/android/settings/network/telephony/ToggleSubscriptionDialogActivity.java
@@ -76,6 +76,7 @@ public class ToggleSubscriptionDialogActivity extends SubscriptionActionDialogAc
         Intent intent = new Intent(context, ToggleSubscriptionDialogActivity.class);
         intent.putExtra(ARG_SUB_ID, subId);
         intent.putExtra(ARG_enable, enable);
+        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
         return intent;
     }
 
diff --git a/src/com/android/settings/sim/receivers/SimSlotChangeHandler.java b/src/com/android/settings/sim/receivers/SimSlotChangeHandler.java
index dabb08896c8..67cac712059 100644
--- a/src/com/android/settings/sim/receivers/SimSlotChangeHandler.java
+++ b/src/com/android/settings/sim/receivers/SimSlotChangeHandler.java
@@ -371,9 +371,7 @@ public class SimSlotChangeHandler {
             return;
         }
         Log.d(TAG, "Start ToggleSubscriptionDialogActivity with " + subId + " under DSDS+Mep.");
-        Intent intent = ToggleSubscriptionDialogActivity.getIntent(mContext, subId, true);
-        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        mContext.startActivityAsUser(intent, UserHandle.SYSTEM);
+        SubscriptionUtil.startToggleSubscriptionDialogActivity(mContext, subId, true);
     }
 
     private boolean isMultipleEnabledProfilesSupported() {