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

Commit 600e75fe authored by Jordan Liu's avatar Jordan Liu Committed by Jack Yu
Browse files

Call join() in teardown before tearing down 

Bug: 113531829
Test: atest CarrierResolverTest
Merged-In: I158fee68fbb5333f3dfd52290a36acd03ea8f31b
Change-Id: I158fee68fbb5333f3dfd52290a36acd03ea8f31b
(cherry picked from commit add7aa2b)
parent 4d53a0c3

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

+2 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.internal.telephony;



import static com.android.internal.telephony.TelephonyTestUtils.waitForMs;



import static org.junit.Assert.assertEquals;

import static org.junit.Assert.assertNull;

import static org.mockito.Matchers.eq;
@@ -104,6 +105,7 @@ public class CarrierResolverTest extends TelephonyTest { 
        mCarrierResolver.removeCallbacksAndMessages(null);

        mCarrierResolver = null;

        mCarrierCarrierResolverHandler.quit();

        mCarrierCarrierResolverHandler.join();

        super.tearDown();

    }