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

Commit aebc5b81 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Call join() in teardown before tearing down"

parents 3df124f7 8588ad33

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 { 
    public void tearDown() throws Exception {

        CallManager.getInstance().unregisterPhone(mPhone);

        mCallManagerHandlerThread.quit();

        mCallManagerHandlerThread.join();

        super.tearDown();

    }

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

+1 −0
Original line number Diff line number Diff line
@@ -189,6 +189,7 @@ public class CarrierActionAgentTest extends TelephonyTest { 
    public void tearDown() throws Exception {

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

        mCarrierActionAgentHandler.quit();

        mCarrierActionAgentHandler.join();

        super.tearDown();

    }

}

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

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

    public void tearDown() throws Exception {

        mCarrierActionAgentHandler.quit();

        mCarrierActionAgentHandler.join();

        super.tearDown();

    }

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

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

    public void tearDown() throws Exception {

        mCarrierServiceStateTrackerTestHandler.quit();

        mCarrierServiceStateTrackerTestHandler.join();

        super.tearDown();

    }

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

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

    public void tearDown() throws Exception {

        mCarrierSignalAgentHandler.quit();

        mCarrierSignalAgentHandler.join();

        super.tearDown();

    }