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

Commit c50f9a2e authored by Sarah Chin's avatar Sarah Chin Committed by Gerrit Code Review
Browse files

Merge "Remove remaining messages after Telephony tests end"

parents 9b9fc061 b52bdbcc

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

+1 −0
Original line number Diff line number Diff line
@@ -350,6 +350,7 @@ public class ServiceStateTrackerTest extends TelephonyTest { 


    @After

    public void tearDown() throws Exception {

        sst.removeCallbacksAndMessages(null);

        sst = null;

        mSSTTestHandler.quit();

        mSSTTestHandler.join();

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

+6 −0
Original line number Diff line number Diff line
@@ -839,6 +839,12 @@ public abstract class TelephonyTest { 
    }



    protected void tearDown() throws Exception {

        // Clear all remaining messages

        if (!mTestableLoopers.isEmpty()) {

            for (TestableLooper looper : mTestableLoopers) {

                looper.getLooper().quit();

            }

        }

        // Ensure there are no references to handlers between tests.

        PhoneConfigurationManager.unregisterAllMultiSimConfigChangeRegistrants();

        // unmonitor TestableLooper for TelephonyTest class