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

Commit 3f02f158 authored by Jack Yu's avatar Jack Yu
Browse files

resolve merge conflicts of 472f667a to oc-dev-plus-aosp 

Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ic87c59cef771bdb320c81fad35de0dcb211a0977
parents 16e4a073 472f667a

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

+4 −1
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ public class CarrierActionAgentTest extends TelephonyTest { 
    private FakeContentProvider mFakeContentProvider;

    private static int DATA_CARRIER_ACTION_EVENT = 0;

    private static int RADIO_CARRIER_ACTION_EVENT = 1;

    private CarrierActionAgentHandler mCarrierActionAgentHandler;

    @Mock

    private Handler mDataActionHandler;

    @Mock
@@ -107,7 +108,8 @@ public class CarrierActionAgentTest extends TelephonyTest { 
        mFakeContentProvider = new FakeContentProvider();

        mFakeContentResolver.addProvider(Settings.AUTHORITY, mFakeContentProvider);

        doReturn(mFakeContentResolver).when(mContext).getContentResolver();

        new CarrierActionAgentHandler(getClass().getSimpleName()).start();

        mCarrierActionAgentHandler = new CarrierActionAgentHandler(getClass().getSimpleName());

        mCarrierActionAgentHandler.start();

        waitUntilReady();

        logd("CarrierActionAgentTest -Setup!");

    }
@@ -131,6 +133,7 @@ public class CarrierActionAgentTest extends TelephonyTest { 
    @After

    public void tearDown() throws Exception {

        Settings.Global.putInt(mFakeContentResolver, Settings.Global.AIRPLANE_MODE_ON, 0);

        mCarrierActionAgentHandler.quit();

        super.tearDown();

    }

}