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

Commit 3d141ae1 authored by Chen Xu's avatar Chen Xu Committed by Android Partner Code Review
Browse files

Merge "Subscription related Unit test with code cleanup" into mm-wireless-dev

parents 71359433 655bae99

src/java/com/android/internal/telephony/SubscriptionController.java

+2 −1
Original line number Diff line number Diff line
@@ -170,7 +170,8 @@ public class SubscriptionController extends ISub.Stub { 
        mContext = c;

        mCM = CallManager.getInstance();

        mTelephonyManager = TelephonyManager.from(mContext);

        mAppOps = mContext.getSystemService(AppOpsManager.class);



        mAppOps = (AppOpsManager)mContext.getSystemService(Context.APP_OPS_SERVICE);



        if(ServiceManager.getService("isub") == null) {

                ServiceManager.addService("isub", this);

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

+4 −0
Original line number Diff line number Diff line
@@ -427,6 +427,10 @@ public class ContextFixture implements TestFixture<Context> { 
        doReturn(values).when(mResources).getStringArray(eq(id));

    }



    public void putIntArrayResource(int id, int[] values) {

        doReturn(values).when(mResources).getIntArray(eq(id));

    }



    public PersistableBundle getCarrierConfigBundle() {

        return mBundle;

    }

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

+103 −152

File changed.

Preview size limit exceeded, changes collapsed.

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

+29 −29

File changed.

Preview size limit exceeded, changes collapsed.

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

+0 −1
Original line number Diff line number Diff line
@@ -93,7 +93,6 @@ public class ServiceStateTrackerTest extends TelephonyTest { 
        logd("ServiceStateTrackerTest +Setup!");

        super.setUp("ServiceStateTrackerTest");



        doReturn(true).when(mPhone).isPhoneTypeGsm();

        doReturn(true).when(mDct).isDisconnected();

        mPhone.mDcTracker = mDct;

        mTelephonyManager = (TelephonyManager) mContextFixture.getTestDouble().