PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix the DSDS dialog status" into main

Browse Source
This commit is contained in:
SongFerng Wang
2024-09-06 07:39:25 +00:00
committed by Android (Google) Code Review
parent 0f49457203 74a76a8067
commit 83a80dd7c1
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/network/SimOnboardingActivity.kt
View File

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