Merge "Show GSM settings with CDMA phone type" into main
diff --git a/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogController.java b/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogController.java
index 1ae6b40..16440b2 100644
--- a/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogController.java
+++ b/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogController.java
@@ -100,8 +100,7 @@
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 89cc6d9..f68f67e 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogControllerTest.java
@@ -143,36 +143,6 @@
}
@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);
when(mTelephonyManager.getPhoneType()).thenReturn(TelephonyManager.PHONE_TYPE_GSM);