From b8d87d1addb79021bae1a2c045040988aab8ea63 Mon Sep 17 00:00:00 2001
From: songferngwang <songferngwang@google.com>
Date: Thu, 29 Feb 2024 07:07:24 +0000
Subject: [PATCH] Modify the condition for hide Dds confirmed dialog

Bug: 318310357
Bug: 298898436
Bug: 298891941
Test: manual test and verify the UI.
Change-Id: I68df36b457ea7479cd6a561f9c2b3c968e14fe44
---
 src/com/android/settings/network/SimOnboardingActivity.kt | 2 +-
 src/com/android/settings/sim/SimDialogActivity.java       | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/com/android/settings/network/SimOnboardingActivity.kt b/src/com/android/settings/network/SimOnboardingActivity.kt
index 6347d7b62f4..b4b2cd06418 100644
--- a/src/com/android/settings/network/SimOnboardingActivity.kt
+++ b/src/com/android/settings/network/SimOnboardingActivity.kt
@@ -102,7 +102,7 @@ class SimOnboardingActivity : SpaBaseDialogActivity() {
 
         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))
diff --git a/src/com/android/settings/sim/SimDialogActivity.java b/src/com/android/settings/sim/SimDialogActivity.java
index 4544e73b87d..8840994b366 100644
--- a/src/com/android/settings/sim/SimDialogActivity.java
+++ b/src/com/android/settings/sim/SimDialogActivity.java
@@ -136,9 +136,7 @@ public class SimDialogActivity extends FragmentActivity {
         }
 
         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");