From 7abc384e332ff248d491d16725ac54ca38a2b9ba Mon Sep 17 00:00:00 2001 From: Qiang Chen Date: Tue, 3 Dec 2024 15:17:47 +0530 Subject: [PATCH] Show GSM settings with CDMA phone type Phone type may be changed to CDMA if no SIM is in this sub and will not show GSM settings in current design, so remove sub info check for showing GSM settings. Show GSM settings if the current radio can support both 3GPP and 3GPP2 radio technologies at the same time. Bug: 278178437 Test: Manaul Change-Id: I4f8cbfcdcff8f74944e2ba9a79b0945be6dd6ebd --- .../imei/ImeiInfoDialogController.java | 3 +- .../imei/ImeiInfoDialogControllerTest.java | 30 ------------------- 2 files changed, 1 insertion(+), 32 deletions(-) diff --git a/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogController.java b/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogController.java index 1ae6b4007b3..16440b25555 100644 --- a/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogController.java +++ b/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogController.java @@ -100,8 +100,7 @@ public class ImeiInfoDialogController { mDialog.setText(ID_PRL_VERSION_VALUE, getCdmaPrlVersion()); - if ((mSubscriptionInfo != null && isCdmaLteEnabled()) || - (mSubscriptionInfo == null && isSimPresent(mSlotId))) { + if (isCdmaLteEnabled()) { // Show IMEI for LTE device mDialog.setText(ID_IMEI_VALUE, mTelephonyManager.getImei(mSlotId)); mDialog.setText(ID_IMEI_SV_VALUE, diff --git a/tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogControllerTest.java index 89cc6d90361..f68f67e112d 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogControllerTest.java @@ -142,36 +142,6 @@ public class ImeiInfoDialogControllerTest { verify(mDialog).removeViewFromScreen(ID_GSM_SETTINGS); } - @Test - public void populateImeiInfo_cdmaSimPresent_shouldSetImeiInfoAndSetAllCdmaSetting() { - ReflectionHelpers.setField(mController, "mSubscriptionInfo", null); - when(mTelephonyManager.getPhoneType()).thenReturn(TelephonyManager.PHONE_TYPE_CDMA); - when(mTelephonyManager.getSimState(anyInt())).thenReturn( - TelephonyManager.SIM_STATE_PRESENT); - - mController.populateImeiInfo(); - - verify(mDialog).setText(ID_MEID_NUMBER_VALUE, MEID_NUMBER); - verify(mDialog).setText(ID_MIN_NUMBER_VALUE, ""); - verify(mDialog).setText(ID_PRL_VERSION_VALUE, ""); - verify(mDialog).setText(eq(ID_IMEI_VALUE), any()); - verify(mDialog).setText(eq(ID_IMEI_SV_VALUE), any()); - } - - @Test - public void populateImeiInfo_cdmaSimABSENT_shouldSetImeiInfoAndSetAllCdmaSetting() { - ReflectionHelpers.setField(mController, "mSubscriptionInfo", null); - when(mTelephonyManager.getPhoneType()).thenReturn(TelephonyManager.PHONE_TYPE_CDMA); - when(mTelephonyManager.getSimState(anyInt())).thenReturn(TelephonyManager.SIM_STATE_ABSENT); - - mController.populateImeiInfo(); - - verify(mDialog).setText(ID_MEID_NUMBER_VALUE, MEID_NUMBER); - verify(mDialog).setText(ID_MIN_NUMBER_VALUE, ""); - verify(mDialog).setText(ID_PRL_VERSION_VALUE, ""); - verify(mDialog).removeViewFromScreen(ID_GSM_SETTINGS); - } - @Test public void populateImeiInfo_gsmSimDisabled_shouldSetImeiAndRemoveCdmaSettings() { ReflectionHelpers.setField(mController, "mSubscriptionInfo", null);