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

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

Merge "Call join() in teardown before tearing down" am: ec834fb9 

am: ca4e3bca

Change-Id: I77a5563a84f0c5cc9d4056d81b99ed75fa97deab
parents c3e0a6e9 ca4e3bca

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

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

package com.android.internal.telephony;





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

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



import static org.junit.Assert.assertEquals;

import static org.junit.Assert.assertEquals;

import static org.junit.Assert.assertNull;

import static org.junit.Assert.assertNull;

import static org.mockito.Matchers.eq;

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

        mCarrierResolver.removeCallbacksAndMessages(null);

        mCarrierResolver = null;

        mCarrierResolver = null;

        mCarrierCarrierResolverHandler.quit();

        mCarrierCarrierResolverHandler.quit();

        mCarrierCarrierResolverHandler.join();

        super.tearDown();

        super.tearDown();

    }

    }