From 74a76a806747d22592e507a30d97b1e63bfe9b78 Mon Sep 17 00:00:00 2001
From: songferngwang <songferngwang@google.com>
Date: Thu, 5 Sep 2024 18:35:27 +0000
Subject: [PATCH] Fix the DSDS dialog status

To avoid the dsds dialog status to reset.

Bug: 364668360
Test: verify enabling DSDS mode
Flag: EXEMPT bugfix
Change-Id: I80a8abd896856740fad1f98de50c79034a4cc602
---
 src/com/android/settings/network/SimOnboardingActivity.kt | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/com/android/settings/network/SimOnboardingActivity.kt b/src/com/android/settings/network/SimOnboardingActivity.kt
index a5d4ade6992..25afb661e8b 100644
--- a/src/com/android/settings/network/SimOnboardingActivity.kt
+++ b/src/com/android/settings/network/SimOnboardingActivity.kt
@@ -221,6 +221,7 @@ class SimOnboardingActivity : SpaBaseDialogActivity() {
                         "showRestartDialog:${showRestartDialog.value}")
                 showStartingDialog.value = false
             } else if (onboardingService.activeSubInfoList.isNotEmpty()) {
+                Log.d(TAG, "status: showStartingDialog.value:${showStartingDialog.value}")
                 showStartingDialog.value = true
             }
         }
@@ -468,11 +469,11 @@ class SimOnboardingActivity : SpaBaseDialogActivity() {
     }
 
     fun handleEnableMultiSimSidecarStateChange() {
-        showDsdsProgressDialog.value = false
         when (enableMultiSimSidecar!!.state) {
             SidecarFragment.State.SUCCESS -> {
                 enableMultiSimSidecar!!.reset()
                 Log.i(TAG, "Successfully switched to DSDS without reboot.")
+                showDsdsProgressDialog.value = false
                 // refresh data
                 initServiceData(this, onboardingService.targetSubId, callbackListener)
                 startSimOnboardingProvider()
@@ -480,6 +481,7 @@ class SimOnboardingActivity : SpaBaseDialogActivity() {
 
             SidecarFragment.State.ERROR -> {
                 enableMultiSimSidecar!!.reset()
+                showDsdsProgressDialog.value = false
                 Log.i(TAG, "Failed to switch to DSDS without rebooting.")
                 showError.value = ErrorType.ERROR_ENABLE_DSDS
                 callbackListener(CallbackType.CALLBACK_ERROR)