commit af5bbc5087fcb45651474ded283653a1b6eb9203
author SongFerng Wang <songferngwang@google.com> Thu Feb 29 11:27:05 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Feb 29 11:27:05 2024 +0000
tree 3bd3634b211a0db6d12c05ea54a3092ef363cbd3
parent e5302bc1f1135eb76d04c82d3c0bfcad6e7a70e0
parent b8d87d1addb79021bae1a2c045040988aab8ea63

Merge "Modify the condition for hide Dds confirmed dialog" into main

src/com/android/settings/network/SimOnboardingActivity.kt

diff --git a/src/com/android/settings/network/SimOnboardingActivity.kt b/src/com/android/settings/network/SimOnboardingActivity.kt
index d06b4dd..1b71161 100644
--- a/src/com/android/settings/network/SimOnboardingActivity.kt
+++ b/src/com/android/settings/network/SimOnboardingActivity.kt
@@ -102,7 +102,7 @@
 
         if (onboardingService.activeSubInfoList.isEmpty()) {
             // TODO: refactor and replace the ToggleSubscriptionDialogActivity
-            Log.e(TAG, "onboardingService.activeSubInfoList is empty" +
+            Log.d(TAG, "onboardingService.activeSubInfoList is empty" +
                     ", start ToggleSubscriptionDialogActivity")
             this.startActivity(ToggleSubscriptionDialogActivity
                     .getIntent(this.applicationContext, targetSubId, true))

src/com/android/settings/sim/SimDialogActivity.java

diff --git a/src/com/android/settings/sim/SimDialogActivity.java b/src/com/android/settings/sim/SimDialogActivity.java
index 4544e73..8840994 100644
--- a/src/com/android/settings/sim/SimDialogActivity.java
+++ b/src/com/android/settings/sim/SimDialogActivity.java
@@ -136,9 +136,7 @@
         }
 
         if (Flags.isDualSimOnboardingEnabled()
-                && getProgressState() == SubscriptionActionDialogActivity.PROGRESS_IS_SHOWING
-                && (dialogType == PREFERRED_PICK
-                || dialogType == DATA_PICK
+                && (dialogType == DATA_PICK
                 || dialogType == CALLS_PICK
                 || dialogType == SMS_PICK)) {
             Log.d(TAG, "Finish the sim dialog since the sim onboarding is shown");