Merge "Fix leak due to PhoneConfigurationManager" into rvc-dev

        sMultiSimConfigChangeRegistrants.remove(h);

    }

    /**

     * Unregister for all multi-SIM configuration change events.

     */

    public static void unregisterAllMultiSimConfigChangeRegistrants() {

        sMultiSimConfigChangeRegistrants.removeAll();

    }

    private void broadcastMultiSimConfigChange(int numOfActiveModems) {

        log("broadcastSimSlotNumChange numOfActiveModems" + numOfActiveModems);

        // Notify internal registrants first.

        bindCarrierServicesIfAvailable();

    }

    /**

     * Destroys this ImsResolver. Used for tearing down static resources during testing.

     */

    @VisibleForTesting

    public void destroy() {

        PhoneConfigurationManager.unregisterForMultiSimConfigChange(mHandler);

        mHandler.removeCallbacksAndMessages(null);

    }

    // Only start the bind if there is an existing Carrier Configuration. Otherwise, wait for

    // carrier config changed.

    private void bindCarrierServicesIfAvailable() {

import android.os.UserHandle;

import android.provider.Settings;

import android.telephony.TelephonyManager;

import android.test.InstrumentationTestCase;

import android.test.mock.MockContentProvider;

import android.test.mock.MockContentResolver;

import android.test.suitebuilder.annotation.SmallTest;

import android.util.ArrayMap;

import android.util.ArraySet;

import androidx.test.InstrumentationRegistry;

import androidx.test.runner.AndroidJUnit4;

import org.junit.Before;

import org.junit.Ignore;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.Mock;

import org.mockito.Mockito;

import org.mockito.MockitoAnnotations;

import java.util.ArrayList;

import java.util.List;

public class CarrierAppUtilsTest extends InstrumentationTestCase {

@RunWith(AndroidJUnit4.class)

public class CarrierAppUtilsTest {

    private static final String CARRIER_APP = "com.example.carrier";

    private static final ArraySet<String> CARRIER_APPS = new ArraySet<>();

    static {

    private SettingsMockContentProvider mContentProvider;

    private MockContentResolver mContentResolver;

    @Override

    @Before

    public void setUp() throws Exception {

        super.setUp();

        System.setProperty("dexmaker.dexcache",

                getInstrumentation().getTargetContext().getCacheDir().getPath());

                InstrumentationRegistry.getTargetContext().getCacheDir().getPath());

        Thread.currentThread().setContextClassLoader(getClass().getClassLoader());

        MockitoAnnotations.initMocks(this);

    }

    protected void tearDown() throws Exception {

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

        PhoneConfigurationManager.unregisterAllMultiSimConfigChangeRegistrants();

        // unmonitor TestableLooper for TelephonyTest class

        if (mTestableLooper != null) {

            unmonitorTestableLooper(mTestableLooper);

    @After

    @Override

    public void tearDown() throws Exception {

        mTestImsResolver.destroy();

        mTestImsResolver = null;

        mLooper.destroy();

        mLooper = null;