Enable option to set removable eSIM as default eUICC irrespective of SS or DSDS mode
UiccController is always setting least index eUICC as default irrespective of whether slot is active or not.
So if embedded eSIM is configured as slot index#0 in device properties, it is set as default even when slot is inactive.
Bug: 228640832
Test: Manual verification on C10P10 Device.(Disable DSDS mode, download profile from settings->SIMs)
Change-Id: Ic6505fe83baa11455d81c53849af94fff4a18838
diff --git a/res/layout/radio_info.xml b/res/layout/radio_info.xml
index 6d1439e..2a2ad89 100644
--- a/res/layout/radio_info.xml
+++ b/res/layout/radio_info.xml
@@ -264,6 +264,7 @@
android:layout_marginTop="8dip"
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:enabled="false"
android:text="@string/removable_esim_string" />
<!-- Horizontal Rule -->
diff --git a/src/com/android/phone/settings/RadioInfo.java b/src/com/android/phone/settings/RadioInfo.java
index ef31298..2058d2d 100644
--- a/src/com/android/phone/settings/RadioInfo.java
+++ b/src/com/android/phone/settings/RadioInfo.java
@@ -580,8 +580,8 @@
}
mRemovableEsimSwitch = (Switch) findViewById(R.id.removable_esim_switch);
- mRemovableEsimSwitch.setEnabled(!IS_USER_BUILD && isDsdsEnabled());
if (!IS_USER_BUILD) {
+ mRemovableEsimSwitch.setEnabled(true);
mRemovableEsimSwitch.setChecked(mTelephonyManager.isRemovableEsimDefaultEuicc());
mRemovableEsimSwitch.setOnCheckedChangeListener(mRemovableEsimChangeListener);
}
@@ -1870,9 +1870,6 @@
private void performDsdsSwitch() {
mTelephonyManager.switchMultiSimConfig(mDsdsSwitch.isChecked() ? 2 : 1);
- if (!IS_USER_BUILD) {
- mRemovableEsimSwitch.setEnabled(mDsdsSwitch.isChecked());
- }
}
/**