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

Update error dialog text for SIM switching

Browse Source 
The error dialog text for SIM switching is not accurate.
This CL updates the error dialog text for SIM switching.

Bug: 363265948
Change-Id: I8b0348fc791cc4d4ce84e1b33f1fe99fb4e03ed7
Test: NA
Flag: EXEMPT bugfix
This commit is contained in:
SongFerng Wang
2024-09-03 10:48:48 +00:00
parent db89eaa0a2
commit 43392fe071
2 changed files with 8 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -328,20 +328,7 @@ class SimOnboardingActivity : SpaBaseDialogActivity() {
@Composable
fun ErrorDialogImpl(){
// EuiccSlotSidecar showErrorDialog
val errorDialogPresenterForEuiccSlotSidecar = rememberAlertDialogPresenter(
confirmButton = AlertDialogButton(
stringResource(android.R.string.ok)
) {
finish()
},
title = stringResource(R.string.privileged_action_disable_fail_title),
text = {
Text(stringResource(R.string.privileged_action_disable_fail_text))
},
)
// RemovableSlotSidecar showErrorDialog
val errorDialogPresenterForRemovableSlotSidecar = rememberAlertDialogPresenter(
val errorDialogPresenterForSimSwitching = rememberAlertDialogPresenter(
confirmButton = AlertDialogButton(
stringResource(android.R.string.ok)
) {
@@ -368,8 +355,7 @@ class SimOnboardingActivity : SpaBaseDialogActivity() {
// show error
when (showError.value) {
ErrorType.ERROR_EUICC_SLOT -> errorDialogPresenterForEuiccSlotSidecar.open()
ErrorType.ERROR_REMOVABLE_SLOT -> errorDialogPresenterForRemovableSlotSidecar.open()
ErrorType.ERROR_SIM_SWITCHING -> errorDialogPresenterForSimSwitching.open()
ErrorType.ERROR_ENABLE_DSDS -> errorDialogPresenterForMultiSimSidecar.open()
else -> {}
}
@@ -455,7 +441,7 @@ class SimOnboardingActivity : SpaBaseDialogActivity() {
SidecarFragment.State.ERROR -> {
Log.i(TAG, "Failed to enable the eSIM profile.")
switchToEuiccSubscriptionSidecar!!.reset()
showError.value = ErrorType.ERROR_EUICC_SLOT
showError.value = ErrorType.ERROR_SIM_SWITCHING
callbackListener(CallbackType.CALLBACK_ERROR)
}
}
@@ -475,7 +461,7 @@ class SimOnboardingActivity : SpaBaseDialogActivity() {
SidecarFragment.State.ERROR -> {
Log.e(TAG, "Failed switching to removable slot.")
switchToRemovableSlotSidecar!!.reset()
showError.value = ErrorType.ERROR_REMOVABLE_SLOT
showError.value = ErrorType.ERROR_SIM_SWITCHING
callbackListener(CallbackType.CALLBACK_ERROR)
}
}
@@ -605,9 +591,8 @@ class SimOnboardingActivity : SpaBaseDialogActivity() {
enum class ErrorType(val value:Int){
ERROR_NONE(-1),
ERROR_EUICC_SLOT(1),
ERROR_REMOVABLE_SLOT(2),
ERROR_ENABLE_DSDS(3)
ERROR_SIM_SWITCHING(1),
ERROR_ENABLE_DSDS(2)
}
enum class CallbackType(val value:Int){