Merge "Fix the updateDialogForCdmaPhone test case failed" into udc-dev am: fb1cebd7f9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23078645 Change-Id: I583abc51b4e4160783d8ca14d810418b675892d9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -39,7 +39,6 @@ import android.telephony.SubscriptionManager;
|
|||||||
import android.telephony.TelephonyManager;
|
import android.telephony.TelephonyManager;
|
||||||
|
|
||||||
import org.junit.Before;
|
import org.junit.Before;
|
||||||
import org.junit.Ignore;
|
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
import org.junit.runner.RunWith;
|
import org.junit.runner.RunWith;
|
||||||
import org.mockito.Mock;
|
import org.mockito.Mock;
|
||||||
@@ -197,11 +196,10 @@ public class ImeiInfoDialogControllerTest {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@Ignore
|
|
||||||
public void populateImeiInfo_emptyImei_shouldSetMeid_imeiSetToEmptyString() {
|
public void populateImeiInfo_emptyImei_shouldSetMeid_imeiSetToEmptyString() {
|
||||||
doReturn(true).when(mController).isCdmaLteEnabled();
|
doReturn(true).when(mController).isCdmaLteEnabled();
|
||||||
when(mTelephonyManager.getPhoneType()).thenReturn(TelephonyManager.PHONE_TYPE_CDMA);
|
when(mTelephonyManager.getPhoneType()).thenReturn(TelephonyManager.PHONE_TYPE_CDMA);
|
||||||
when(mTelephonyManager.getImei(anyInt())).thenReturn(null);
|
when(mTelephonyManager.getImei(anyInt())).thenReturn("");
|
||||||
|
|
||||||
mController.populateImeiInfo();
|
mController.populateImeiInfo();
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user