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

Commit b8348982 authored by Jack Yu's avatar Jack Yu Committed by android-build-merger
Browse files

Merge "Fixed file descriptor leak in telephony unit tests" 

am: b36f8c8e

Change-Id: Ia675c46e35085d7b8372b232515ac2f61f27ad55
parents 956123f8 b36f8c8e

src/java/com/android/internal/telephony/test/SimulatedCommands.java

+6 −0
Original line number Diff line number Diff line
@@ -151,6 +151,12 @@ public class SimulatedCommands extends BaseCommands 
        mPin2Code = DEFAULT_SIM_PIN2_CODE;

    }



    public void dispose() {

        if (mHandlerThread != null) {

            mHandlerThread.quit();

        }

    }



    private void log(String str) {

        Rlog.d(LOG_TAG, str);

    }

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

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

    public void tearDown() throws Exception {

        CallManager.getInstance().unregisterPhone(mPhone);

        mCallManagerHandlerThread.quitSafely();

        mCallManagerHandlerThread.quit();

        super.tearDown();

    }

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

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ public class DeviceStateMonitorTest extends TelephonyTest { 
    @After

    public void tearDown() throws Exception {

        mDeviceStateMonitor = null;

        mDeviceStateMonitorTestHandler.quitSafely();

        mDeviceStateMonitorTestHandler.quit();

        super.tearDown();

    }

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

+1 −1
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ public class GsmCdmaCallTrackerTest extends TelephonyTest { 
    @After

    public void tearDown() throws Exception {

        mCTUT = null;

        mGsmCdmaCTHandlerThread.quitSafely();

        mGsmCdmaCTHandlerThread.quit();

        super.tearDown();

    }

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

+1 −1
Original line number Diff line number Diff line
@@ -132,7 +132,7 @@ public class GsmCdmaPhoneTest extends TelephonyTest { 
    public void tearDown() throws Exception {

        mPhoneUT.removeCallbacksAndMessages(null);

        mPhoneUT = null;

        mGsmCdmaPhoneTestHandler.quitSafely();

        mGsmCdmaPhoneTestHandler.quit();

        super.tearDown();

    }