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

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

Merge "Remove remaining messages after Telephony tests end" into tm-dev

parents be703227 380d2271

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
@@ -838,6 +838,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