Modify the condition for hide Dds confirmed dialog
Bug: 318310357
Bug: 298898436
Bug: 298891941
Test: manual test and verify the UI.
Change-Id: I68df36b457ea7479cd6a561f9c2b3c968e14fe44
diff --git a/src/com/android/settings/network/SimOnboardingActivity.kt b/src/com/android/settings/network/SimOnboardingActivity.kt
index 6347d7b..b4b2cd0 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))
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");