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

Merge "Check euiccManager available before update EID"

Browse Source
This commit is contained in:
TreeHugger Robot
2019-03-02 00:57:26 +00:00
committed by Android (Google) Code Review
parent a4c1f0ada7 02f2547482
commit 588502158d
2 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java
View File

@@ -381,7 +381,11 @@ public class SimStatusDialogController implements LifecycleObserver, OnResume, O
}
private void updateEid() {
mDialog.setText(EID_INFO_VALUE_ID, mEuiccManager.getEid());
if (mEuiccManager.isEnabled()) {
mDialog.setText(EID_INFO_VALUE_ID, mEuiccManager.getEid());
} else {
mDialog.removeSettingFromScreen(EID_INFO_VALUE_ID);
}
}
private void updateImsRegistrationState() {

12
tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogControllerTest.java
View File

@@ -124,6 +124,7 @@ public class SimStatusDialogControllerTest {
doReturn("").when(mController).getPhoneNumber();
doReturn(mSignalStrength).when(mController).getSignalStrength();
when(mEuiccManager.isEnabled()).thenReturn(true);
when(mEuiccManager.getEid()).thenReturn("");
ReflectionHelpers.setField(mController, "mTelephonyManager", mTelephonyManager);
ReflectionHelpers.setField(mController, "mCarrierConfigManager", mCarrierConfigManager);
@@ -352,6 +353,17 @@ public class SimStatusDialogControllerTest {
mController.initialize();
verify(mDialog).setText(EID_INFO_VALUE_ID, eid);
verify(mDialog, never()).removeSettingFromScreen(eq(EID_INFO_VALUE_ID));
}
@Test
public void initialize_showEid_euiccManagerIsNotEnabled() {
when(mEuiccManager.isEnabled()).thenReturn(false);
mController.initialize();
verify(mDialog, never()).setText(eq(EID_INFO_VALUE_ID), any());
verify(mDialog).removeSettingFromScreen(eq(EID_INFO_VALUE_ID));
}
@Test