From 43392fe071f761c7bba3ba1d1fbd2de3c8d9bc12 Mon Sep 17 00:00:00 2001
From: SongFerng Wang <songferngwang@google.com>
Date: Tue, 3 Sep 2024 10:48:48 +0000
Subject: [PATCH] Update error dialog text for SIM switching

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
---
 .../settings/network/SimOnboardingActivity.kt | 27 +++++--------------
 .../ToggleSubscriptionDialogActivity.java     |  4 +--
 2 files changed, 8 insertions(+), 23 deletions(-)

diff --git a/src/com/android/settings/network/SimOnboardingActivity.kt b/src/com/android/settings/network/SimOnboardingActivity.kt
index e39966a71b0..a5d4ade6992 100644
--- a/src/com/android/settings/network/SimOnboardingActivity.kt
+++ b/src/com/android/settings/network/SimOnboardingActivity.kt
@@ -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){
diff --git a/src/com/android/settings/network/telephony/ToggleSubscriptionDialogActivity.java b/src/com/android/settings/network/telephony/ToggleSubscriptionDialogActivity.java
index 981e5bb3a75..f9751f1bc3c 100644
--- a/src/com/android/settings/network/telephony/ToggleSubscriptionDialogActivity.java
+++ b/src/com/android/settings/network/telephony/ToggleSubscriptionDialogActivity.java
@@ -252,8 +252,8 @@ public class ToggleSubscriptionDialogActivity extends SubscriptionActionDialogAc
                 mSwitchToEuiccSubscriptionSidecar.reset();
                 dismissProgressDialog();
                 showErrorDialog(
-                        getString(R.string.privileged_action_disable_fail_title),
-                        getString(R.string.privileged_action_disable_fail_text));
+                        getString(R.string.sim_action_enable_sim_fail_title),
+                        getString(R.string.sim_action_enable_sim_fail_text));
                 break;
         }
     }