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

Commit af292427 authored by Brad Ebinger's avatar Brad Ebinger Committed by android-build-merger
Browse files

Merge "fix flaky test for DcTrackerTest.testUserDisableRoaming" am: 1aa0019c 

am: 5b475ff2

Change-Id: I249b63a1f870deee436fb7310d8c939b49d829ba
parents 7be21989 5b475ff2

tests/telephonytests/src/com/android/internal/telephony/dataconnection/DcTrackerTest.java

+6 −1
Original line number Diff line number Diff line
@@ -735,14 +735,19 @@ public class DcTrackerTest extends TelephonyTest { 
                new String[]{PhoneConstants.APN_TYPE_DEFAULT, PhoneConstants.APN_TYPE_MMS});



        mDct.enableApn(ApnSetting.TYPE_IMS, DcTracker.REQUEST_TYPE_NORMAL, null);

        waitForHandlerAction(mDct, 1000);

        mDct.enableApn(ApnSetting.TYPE_DEFAULT, DcTracker.REQUEST_TYPE_NORMAL, null);

        waitForHandlerAction(mDct, 1000);



        logd("Sending EVENT_RECORDS_LOADED");

        mDct.sendMessage(mDct.obtainMessage(DctConstants.EVENT_RECORDS_LOADED, null));

        waitForMs(200);

        waitForHandlerAction(mDct, 1000);



        logd("Sending EVENT_DATA_CONNECTION_ATTACHED");

        mDct.sendMessage(mDct.obtainMessage(DctConstants.EVENT_DATA_CONNECTION_ATTACHED, null));

        waitForHandlerAction(mDct, 1000);

        logd("Handling EVENT_DATA_CONNECTION_ATTACHED complete");

        // dataconnection is on a different handler

        waitForMs(200);



        ArgumentCaptor<DataProfile> dpCaptor = ArgumentCaptor.forClass(DataProfile.class);