From 02f2547482af04cf1faad8a2e04b8da16c57486b Mon Sep 17 00:00:00 2001 From: Qingxi Li Date: Wed, 27 Feb 2019 16:58:48 -0800 Subject: [PATCH] Check euiccManager available before update EID Test: E2E & Included Bug: 126264451 Change-Id: Ic3876567dd139819d67e8b6ddc6f2b6ba03c98fa --- .../simstatus/SimStatusDialogController.java | 6 +++++- .../simstatus/SimStatusDialogControllerTest.java | 12 ++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java b/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java index af0bf5a0c19..d95320fba8f 100644 --- a/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java +++ b/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java @@ -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() { diff --git a/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogControllerTest.java index 07e42706716..5a4a809ec0b 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogControllerTest.java @@ -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