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

Commit b808324d authored by Amit Mahajan's avatar Amit Mahajan Committed by android-build-merger
Browse files

Fixed failing tests. am: 7e924025 

am: ea379f5a

Change-Id: I7fb1709cd6849aa8049ec56fd4f89d2f999b5574
parents 84941435 ea379f5a

src/java/com/android/internal/telephony/dataconnection/DcTracker.java

+1 −1
Original line number Diff line number Diff line
@@ -1090,7 +1090,7 @@ public class DcTracker extends Handler { 


    @Override

    protected void finalize() {

        if(DBG) log("finalize");

        if(DBG && mPhone != null) log("finalize");

    }



    private ApnContext addApnContext(String type, NetworkConfig networkConfig) {

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

+1 −0
Original line number Diff line number Diff line
@@ -122,6 +122,7 @@ public class CallManagerTest extends TelephonyTest { 
    @After

    public void tearDown() throws Exception {

        CallManager.getInstance().unregisterPhone(mPhone);

        mCallManagerHandlerThread.quitSafely();

        super.tearDown();

    }

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

+4 −1
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ public class GsmCdmaCallTrackerTest extends TelephonyTest { 
    private String mDialString = PhoneNumberUtils.stripSeparators("+17005554141");

    /* Handler class initiated at the HandlerThread */

    private GsmCdmaCallTracker mCTUT;

    private GsmCdmaCTHandlerThread mGsmCdmaCTHandlerThread;

    @Mock

    GsmCdmaCall mCall;

    @Mock
@@ -69,7 +70,8 @@ public class GsmCdmaCallTrackerTest extends TelephonyTest { 
        mContextFixture.putStringArrayResource(com.android.internal.R.array.dial_string_replace,

                new String[]{});



        new GsmCdmaCTHandlerThread(TAG).start();

        mGsmCdmaCTHandlerThread = new GsmCdmaCTHandlerThread(TAG);

        mGsmCdmaCTHandlerThread.start();



        waitUntilReady();

        logd("GsmCdmaCallTracker initiated, waiting for Power on");
@@ -82,6 +84,7 @@ public class GsmCdmaCallTrackerTest extends TelephonyTest { 
    @After

    public void tearDown() throws Exception {

        mCTUT = null;

        mGsmCdmaCTHandlerThread.quitSafely();

        super.tearDown();

    }

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

+4 −1
Original line number Diff line number Diff line
@@ -72,6 +72,7 @@ public class GsmCdmaPhoneTest extends TelephonyTest { 


    //mPhoneUnderTest

    private GsmCdmaPhone mPhoneUT;

    private GsmCdmaPhoneTestHandler mGsmCdmaPhoneTestHandler;



    private static final int EVENT_EMERGENCY_CALLBACK_MODE_EXIT = 1;

    private static final int EVENT_EMERGENCY_CALL_TOGGLE = 2;
@@ -114,7 +115,8 @@ public class GsmCdmaPhoneTest extends TelephonyTest { 


        doReturn(false).when(mSST).isDeviceShuttingDown();



        new GsmCdmaPhoneTestHandler(TAG).start();

        mGsmCdmaPhoneTestHandler = new GsmCdmaPhoneTestHandler(TAG);

        mGsmCdmaPhoneTestHandler.start();

        waitUntilReady();

        ArgumentCaptor<Integer> integerArgumentCaptor = ArgumentCaptor.forClass(Integer.class);

        verify(mUiccController).registerForIccChanged(eq(mPhoneUT), integerArgumentCaptor.capture(),
@@ -129,6 +131,7 @@ public class GsmCdmaPhoneTest extends TelephonyTest { 
    public void tearDown() throws Exception {

        mPhoneUT.removeCallbacksAndMessages(null);

        mPhoneUT = null;

        mGsmCdmaPhoneTestHandler.quitSafely();

        super.tearDown();

    }

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

+4 −1
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ public class ImsSMSDispatcherTest extends TelephonyTest { 
    private SMSDispatcher.SmsTracker mTracker;



    private ImsSMSDispatcher mImsSmsDispatcher;

    private ImsSmsDispatcherTestHandler mImsSmsDispatcherTestHandler;

    private boolean mReceivedTestIntent = false;

    private Object mLock = new Object();

    private static final String TEST_INTENT = "com.android.internal.telephony.TEST_INTENT";
@@ -86,13 +87,15 @@ public class ImsSMSDispatcherTest extends TelephonyTest { 
        super.setUp(getClass().getSimpleName());

        setupMockPackagePermissionChecks();



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

        mImsSmsDispatcherTestHandler = new ImsSmsDispatcherTestHandler(getClass().getSimpleName());

        mImsSmsDispatcherTestHandler.start();

        waitUntilReady();

    }



    @After

    public void tearDown() throws Exception {

        mImsSmsDispatcher = null;

        mImsSmsDispatcherTestHandler.quitSafely();

        super.tearDown();

    }