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

Commit 1ffae41f authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add check KEY_HIDE_CARRIER_NETWORK_SETTINGS_BOOL" into qt-dev

parents cb38ac25 85398a50

src/com/android/settings/network/telephony/ApnPreferenceController.java

+4 −1
Original line number Diff line number Diff line
@@ -65,8 +65,11 @@ public class ApnPreferenceController extends TelephonyBasePreferenceController i 
        final boolean isGsmApn = MobileNetworkUtils.isGsmOptions(mContext, subId)

                && carrierConfig != null

                && carrierConfig.getBoolean(CarrierConfigManager.KEY_APN_EXPAND_BOOL);

        final boolean hideCarrierNetwork = carrierConfig == null

                || carrierConfig.getBoolean(

                CarrierConfigManager.KEY_HIDE_CARRIER_NETWORK_SETTINGS_BOOL);



        return isCdmaApn || isGsmApn

        return !hideCarrierNetwork && (isCdmaApn || isGsmApn)

                ? AVAILABLE

                : CONDITIONALLY_UNAVAILABLE;

    }

src/com/android/settings/network/telephony/MobileNetworkUtils.java

+2 −0
Original line number Diff line number Diff line
@@ -355,6 +355,8 @@ public class MobileNetworkUtils { 
                || carrierConfig == null

                || !carrierConfig.getBoolean(

                CarrierConfigManager.KEY_OPERATOR_SELECTION_EXPAND_BOOL)

                || carrierConfig.getBoolean(

                CarrierConfigManager.KEY_HIDE_CARRIER_NETWORK_SETTINGS_BOOL)

                || (carrierConfig.getBoolean(CarrierConfigManager.KEY_CSP_ENABLED_BOOL)

                && !telephonyManager.isManualNetworkSelectionAllowed())) {

            return false;

src/com/android/settings/network/telephony/gsm/AutoSelectPreferenceController.java

+0 −1
Original line number Diff line number Diff line
@@ -52,7 +52,6 @@ public class AutoSelectPreferenceController extends TelephonyTogglePreferenceCon 
    private static final long MINIMUM_DIALOG_TIME_MILLIS = TimeUnit.SECONDS.toMillis(1);



    private final Handler mUiHandler;

    private int mSubId;

    private TelephonyManager mTelephonyManager;

    private boolean mOnlyAutoSelectInHome;

    private List<OnNetworkSelectModeListener> mListeners;

src/com/android/settings/network/telephony/gsm/OpenNetworkSelectPagePreferenceController.java

+0 −1
Original line number Diff line number Diff line
@@ -42,7 +42,6 @@ public class OpenNetworkSelectPagePreferenceController extends 
        TelephonyBasePreferenceController implements

        AutoSelectPreferenceController.OnNetworkSelectModeListener {



    private int mSubId;

    private TelephonyManager mTelephonyManager;

    private Preference mPreference;

tests/robotests/src/com/android/settings/network/telephony/ApnPreferenceControllerTest.java

+12 −0
Original line number Diff line number Diff line
@@ -123,6 +123,18 @@ public class ApnPreferenceControllerTest { 
        assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);

    }





    @Test

    public void getAvailabilityStatus_hideCarrierNetworkSettings_returnUnavailable() {

        doReturn(PhoneConstants.PHONE_TYPE_GSM).when(mTelephonyManager).getPhoneType();

        final PersistableBundle bundle = new PersistableBundle();

        bundle.putBoolean(CarrierConfigManager.KEY_APN_EXPAND_BOOL, true);

        bundle.putBoolean(CarrierConfigManager.KEY_HIDE_CARRIER_NETWORK_SETTINGS_BOOL, true);

        doReturn(bundle).when(mCarrierConfigManager).getConfigForSubId(SUB_ID);



        assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);

    }



    @Test

    public void handPreferenceTreeClick_fireIntent() {

        ArgumentCaptor<Intent> captor = ArgumentCaptor.forClass(Intent.class);