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

Commit a3267c08 authored by Malcolm Chen's avatar Malcolm Chen Committed by android-build-merger
Browse files

Merge "Fix bug that sPhones is not mocked in test." 

am: e3e13a38

Change-Id: Ia452c5855d5768253d04292a3192ce4c99cbb71f
parents 70cbafc6 e3e13a38

tests/telephonytests/src/com/android/internal/telephony/TelephonyTest.java

+3 −1
Original line number Diff line number Diff line
@@ -210,7 +210,7 @@ public abstract class TelephonyTest { 
    private Object mLock = new Object();

    private boolean mReady;

    protected HashMap<String, IBinder> mServiceManagerMockedServices = new HashMap<>();

    private Phone[] mPhones = new Phone[] {mPhone};

    private Phone[] mPhones;





    protected HashMap<Integer, ImsManager> mImsManagerInstances = new HashMap<>();
@@ -309,6 +309,7 @@ public abstract class TelephonyTest { 
        TAG = tag;

        MockitoAnnotations.initMocks(this);



        mPhones = new Phone[] {mPhone};

        mSimulatedCommands = new SimulatedCommands();

        mContextFixture = new ContextFixture();

        mContext = mContextFixture.getTestDouble();
@@ -461,6 +462,7 @@ public abstract class TelephonyTest { 


        //SIM

        doReturn(1).when(mTelephonyManager).getSimCount();

        doReturn(1).when(mTelephonyManager).getPhoneCount();



        //Data

        //Initial state is: userData enabled, provisioned.