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

Commit 3731bb0e authored by Lucas Lin's avatar Lucas Lin Committed by Automerger Merge Worker
Browse files

Merge "Make a customized context when matching a record in MccMncOverrideInfo" am: 154477d9 

Change-Id: Idc9880a123dbf8298fe27f526c036c4d3ed70553
parents fdae1d2c 154477d9

src/com/android/server/connectivity/NetworkMonitor.java

+55 −8
Original line number Diff line number Diff line
@@ -141,6 +141,7 @@ import android.telephony.TelephonyManager; 
import android.text.TextUtils;

import android.util.Log;

import android.util.Pair;

import android.util.SparseArray;



import androidx.annotation.ArrayRes;

import androidx.annotation.BoolRes;
@@ -218,6 +219,8 @@ public class NetworkMonitor extends StateMachine { 
    private static final int SOCKET_TIMEOUT_MS = 10000;

    private static final int PROBE_TIMEOUT_MS  = 3000;



    private static final int UNSET_MCC_OR_MNC = -1;



    private static final int CAPPORT_API_MAX_JSON_LENGTH = 4096;

    private static final String ACCEPT_HEADER = "Accept";

    private static final String CONTENT_TYPE_HEADER = "Content-Type";
@@ -241,6 +244,24 @@ public class NetworkMonitor extends StateMachine { 
        }

    }



    @VisibleForTesting

    protected static final class MccMncOverrideInfo {

        public final int mcc;

        public final int mnc;

        MccMncOverrideInfo(int mcc, int mnc) {

            this.mcc = mcc;

            this.mnc = mnc;

        }

    }



    @VisibleForTesting

    protected static final SparseArray<MccMncOverrideInfo> sCarrierIdToMccMnc = new SparseArray<>();



    static {

        // CTC

        sCarrierIdToMccMnc.put(1854, new MccMncOverrideInfo(460, 03));

    }



    /**

     * ConnectivityService has sent a notification to indicate that network has connected.

     * Initiates Network Validation.
@@ -1507,25 +1528,51 @@ public class NetworkMonitor extends StateMachine { 
        }

    }



    /**

     * Return a matched MccMncOverrideInfo if carrier id and sim mccmnc are matching a record in

     * sCarrierIdToMccMnc.

     */

    @VisibleForTesting

    protected Context getContextByMccIfNoSimCardOrDefault() {

    @Nullable

    MccMncOverrideInfo getMccMncOverrideInfo() {

        final int carrierId = mTelephonyManager.getSimCarrierId();

        return sCarrierIdToMccMnc.get(carrierId);

    }



    private Context getContextByMccMnc(final int mcc, final int mnc) {

        final Configuration config = mContext.getResources().getConfiguration();

        if (mcc != UNSET_MCC_OR_MNC) config.mcc = mcc;

        if (mnc != UNSET_MCC_OR_MNC) config.mnc = mnc;

        return mContext.createConfigurationContext(config);

    }



    @VisibleForTesting

    protected Context getCustomizedContextOrDefault() {

        // Return customized context if carrier id can match a record in sCarrierIdToMccMnc.

        final MccMncOverrideInfo overrideInfo = getMccMncOverrideInfo();

        if (overrideInfo != null) {

            return getContextByMccMnc(overrideInfo.mcc, overrideInfo.mnc);

        }



        // Use neighbor mcc feature only works when the config_no_sim_card_uses_neighbor_mcc is

        // true and there is no sim card inserted.

        final boolean useNeighborResource =

                getResBooleanConfig(mContext, R.bool.config_no_sim_card_uses_neighbor_mcc, false);

        if (!useNeighborResource

                || TelephonyManager.SIM_STATE_READY == mTelephonyManager.getSimState()) {

            return mContext;

        }



        final String mcc = getLocationMcc();

        if (TextUtils.isEmpty(mcc)) {

            return mContext;

        }

        final Configuration config = mContext.getResources().getConfiguration();

        config.mcc = Integer.parseInt(mcc);

        return mContext.createConfigurationContext(config);



        return getContextByMccMnc(Integer.parseInt(mcc), UNSET_MCC_OR_MNC);

    }



    private String getCaptivePortalServerHttpsUrl() {

        final Context targetContext = getContextByMccIfNoSimCardOrDefault();

        final Context targetContext = getCustomizedContextOrDefault();

        return getSettingFromResource(targetContext, R.string.config_captive_portal_https_url,

                R.string.default_captive_portal_https_url, CAPTIVE_PORTAL_HTTPS_URL);

    }
@@ -1604,7 +1651,7 @@ public class NetworkMonitor extends StateMachine { 
     * on one URL that can be used, while NetworkMonitor may implement more complex logic.

     */

    public String getCaptivePortalServerHttpUrl() {

        final Context targetContext = getContextByMccIfNoSimCardOrDefault();

        final Context targetContext = getCustomizedContextOrDefault();

        return getSettingFromResource(targetContext, R.string.config_captive_portal_http_url,

                R.string.default_captive_portal_http_url, CAPTIVE_PORTAL_HTTP_URL);

    }
@@ -1759,7 +1806,7 @@ public class NetworkMonitor extends StateMachine { 
     */

    private <T> T[] getProbeUrlArrayConfig(@NonNull T[] providerValue, @ArrayRes int configResId,

            @ArrayRes int defaultResId, @NonNull Function<String, T> resourceConverter) {

        final Resources res = getContextByMccIfNoSimCardOrDefault().getResources();

        final Resources res = getCustomizedContextOrDefault().getResources();

        return getProbeUrlArrayConfig(providerValue, configResId, res.getStringArray(defaultResId),

                resourceConverter);

    }
@@ -1777,7 +1824,7 @@ public class NetworkMonitor extends StateMachine { 
     */

    private <T> T[] getProbeUrlArrayConfig(@NonNull T[] providerValue, @ArrayRes int configResId,

            String[] defaultConfig, @NonNull Function<String, T> resourceConverter) {

        final Resources res = getContextByMccIfNoSimCardOrDefault().getResources();

        final Resources res = getCustomizedContextOrDefault().getResources();

        String[] configValue = res.getStringArray(configResId);



        if (configValue.length == 0) {

tests/unit/src/com/android/server/connectivity/NetworkMonitorTest.java

+27 −3
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ import static junit.framework.Assert.assertEquals; 
import static junit.framework.Assert.assertFalse;



import static org.junit.Assert.assertArrayEquals;

import static org.junit.Assert.assertNotEquals;

import static org.junit.Assert.assertNotNull;

import static org.junit.Assert.assertNull;

import static org.junit.Assert.assertTrue;
@@ -693,14 +694,37 @@ public class NetworkMonitorTest { 
        // The count of 460 is 2 and the count of 466 is 1, so the getLocationMcc() should return

        // 460.

        assertEquals("460", wnm.getLocationMcc());

        // getContextByMccIfNoSimCardOrDefault() shouldn't return mContext when using neighbor mcc

        // getCustomizedContextOrDefault() shouldn't return mContext when using neighbor mcc

        // is enabled and the sim is not ready.

        doReturn(true).when(mResources).getBoolean(R.bool.config_no_sim_card_uses_neighbor_mcc);

        doReturn(TelephonyManager.SIM_STATE_ABSENT).when(mTelephony).getSimState();

        assertEquals(460,

                wnm.getContextByMccIfNoSimCardOrDefault().getResources().getConfiguration().mcc);

                wnm.getCustomizedContextOrDefault().getResources().getConfiguration().mcc);

        doReturn(false).when(mResources).getBoolean(R.bool.config_no_sim_card_uses_neighbor_mcc);

        assertEquals(wnm.getContext(), wnm.getContextByMccIfNoSimCardOrDefault());

        assertEquals(wnm.getContext(), wnm.getCustomizedContextOrDefault());

    }



    @Test

    public void testGetMccMncOverrideInfo() {

        final WrappedNetworkMonitor wnm = makeNotMeteredNetworkMonitor();

        doReturn(new ContextWrapper(mContext)).when(mContext).createConfigurationContext(any());

        // 1839 is VZW's carrier id.

        doReturn(1839).when(mTelephony).getSimCarrierId();

        assertNull(wnm.getMccMncOverrideInfo());

        // 1854 is CTC's carrier id.

        doReturn(1854).when(mTelephony).getSimCarrierId();

        assertNotNull(wnm.getMccMncOverrideInfo());

        // Check if the mcc & mnc has changed as expected.

        assertEquals(460,

                wnm.getCustomizedContextOrDefault().getResources().getConfiguration().mcc);

        assertEquals(03,

                wnm.getCustomizedContextOrDefault().getResources().getConfiguration().mnc);

        // Every mcc and mnc should be set in sCarrierIdToMccMnc.

        // Check if there is any unset value in mcc or mnc.

        for (int i = 0; i < wnm.sCarrierIdToMccMnc.size(); i++) {

            assertNotEquals(-1, wnm.sCarrierIdToMccMnc.valueAt(i).mcc);

            assertNotEquals(-1, wnm.sCarrierIdToMccMnc.valueAt(i).mnc);

        }

    }



    private CellInfoGsm makeTestCellInfoGsm(String mcc) throws Exception {