| commit | e42c86703b35743b0a664910b4770723833563da | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Mon May 08 11:42:00 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon May 08 11:42:00 2023 +0000 |
| tree | dbba4bcec8840af7f69f2658c8d944be34ebc526 | |
| parent | 07ee2d859ddfbbeaca3220929c083ac79bf50001 [diff] | |
| parent | dc11c2480633061150bacbd0da153a0da4ccd914 [diff] |
Merge "Fix the updateDialogForCdmaPhone test case failed" into udc-dev am: fb1cebd7f9 am: dc11c24806 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23078645 Change-Id: I417be26a4538146e20432c71bf6858e1f6bc8026 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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 a396a92..89cc6d9 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogControllerTest.java
@@ -39,7 +39,6 @@ import android.telephony.TelephonyManager; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; @@ -197,11 +196,10 @@ } @Test - @Ignore public void populateImeiInfo_emptyImei_shouldSetMeid_imeiSetToEmptyString() { doReturn(true).when(mController).isCdmaLteEnabled(); when(mTelephonyManager.getPhoneType()).thenReturn(TelephonyManager.PHONE_TYPE_CDMA); - when(mTelephonyManager.getImei(anyInt())).thenReturn(null); + when(mTelephonyManager.getImei(anyInt())).thenReturn(""); mController.populateImeiInfo();