Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e42c8670 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix the updateDialogForCdmaPhone test case failed" into udc-dev am:... 

Merge "Fix the updateDialogForCdmaPhone test case failed" into udc-dev am: fb1cebd7 am: dc11c248

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23078645



Change-Id: I417be26a4538146e20432c71bf6858e1f6bc8026
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 07ee2d85 dc11c248

tests/robotests/src/com/android/settings/deviceinfo/imei/ImeiInfoDialogControllerTest.java

+1 −3
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ import android.telephony.SubscriptionManager; 
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 @@ public class ImeiInfoDialogControllerTest { 
    }



    @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();