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

Commit 6b4e5a23 authored by Lei Yu's avatar Lei Yu Committed by Android (Google) Code Review
Browse files

Merge changes Iafe111bf,Ie9d8e935 

* changes:
  update CdmaApnPreferenceController
  Add network selection preferences
parents f3baeb1e 4c0b300e

res/xml/gsm_umts_options.xml

+0 −22
Original line number Diff line number Diff line
@@ -16,28 +16,6 @@ 
-->



<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">



    <com.android.settings.network.telephony.NetworkOperators

        android:key="network_operators_category_key"

        android:title="@string/network_operator_category"

        android:persistent="false">



        <SwitchPreference

            android:key="button_auto_select_key"

            android:title="@string/select_automatically"

            android:persistent="false"/>



        <com.android.settings.network.telephony.NetworkSelectListPreference

            android:key="button_network_select_key"

            android:title="@string/network_select_title"

            android:persistent="false"/>



        <Preference

            android:key="button_choose_network_key"

            android:title="@string/choose_network_title"

            android:fragment="com.android.phone.NetworkSelectSetting" />

    </com.android.settings.network.telephony.NetworkOperators>



    <!--We want separate APN setting from reset of settings because-->

    <!--we want user to change it with caution.-->

    <PreferenceCategory

res/xml/network_setting_fragment.xml

+22 −7
Original line number Diff line number Diff line
@@ -117,15 +117,30 @@ 
        android:dialogTitle="@string/cdma_subscription_dialogtitle"

        settings:controller="com.android.settings.network.telephony.cdma.CdmaSubscriptionPreferenceController"/>



    <!--We want separate APN setting from reset of settings because we want user to change it with caution-->

    <PreferenceCategory

        android:key="category_cdma_apn_key">

        android:key="network_operators_category_key"

        android:title="@string/network_operator_category"

        settings:controller="com.android.settings.widget.PreferenceCategoryController">



        <SwitchPreference

            android:key="auto_select_key"

            android:title="@string/select_automatically"

            settings:controller="com.android.settings.network.telephony.gsm.AutoSelectPreferenceController"/>



        <Preference

            android:key="choose_network_key"

            android:title="@string/choose_network_title"

            android:fragment="com.android.phone.NetworkSelectSetting"

            settings:controller="com.android.settings.network.telephony.gsm.OpenNetworkSelectPagePreferenceController"/>

    </PreferenceCategory>



    <!--We want separate APN setting from reset of settings because we want user to change it with caution-->

    <com.android.settingslib.RestrictedPreference

            android:key="button_cdma_apn_key"

            android:title="@string/apn_settings"

        android:key="telephony_apn_key"

        android:persistent="false"

            settings:controller="com.android.settings.network.telephony.cdma.CdmaApnPreferenceController"/>

    </PreferenceCategory>

        android:title="@string/apn_settings"

        settings:allowDividerAbove="true"

        settings:controller="com.android.settings.network.telephony.ApnPreferenceController"/>



    <Preference

        android:key="carrier_settings_key"

src/com/android/settings/network/telephony/cdma/CdmaApnPreferenceController.java→src/com/android/settings/network/telephony/ApnPreferenceController.java

+143 −0
Original line number Diff line number Diff line
@@ -14,10 +14,15 @@ 
 * limitations under the License.

 */



package com.android.settings.network.telephony.cdma;

package com.android.settings.network.telephony;



import static android.provider.Telephony.Carriers.ENFORCE_MANAGED_URI;



import android.content.Context;

import android.content.Intent;

import android.database.ContentObserver;

import android.os.Handler;

import android.os.Looper;

import android.os.PersistableBundle;

import android.provider.Settings;

import android.telephony.CarrierConfigManager;
@@ -27,47 +32,69 @@ import androidx.preference.Preference; 
import androidx.preference.PreferenceScreen;



import com.android.settings.SettingsActivity;

import com.android.settings.core.BasePreferenceController;

import com.android.settings.network.ApnSettings;

import com.android.settings.network.telephony.MobileNetworkUtils;

import com.android.settingslib.RestrictedLockUtilsInternal;

import com.android.settingslib.RestrictedPreference;

import com.android.settingslib.core.lifecycle.LifecycleObserver;

import com.android.settingslib.core.lifecycle.events.OnStart;

import com.android.settingslib.core.lifecycle.events.OnStop;



/**

 * Preference controller for "CDMA Apn"

 * Preference controller for "Apn settings"

 */

public class CdmaApnPreferenceController extends CdmaBasePreferenceController {

public class ApnPreferenceController extends BasePreferenceController implements

        LifecycleObserver, OnStart, OnStop {



    private static final String CATEGORY_KEY = "category_cdma_apn_key";

    @VisibleForTesting

    CarrierConfigManager mCarrierConfigManager;

    private int mSubId;

    private Preference mPreference;

    private DpcApnEnforcedObserver mDpcApnEnforcedObserver;



    public CdmaApnPreferenceController(Context context, String key) {

    public ApnPreferenceController(Context context, String key) {

        super(context, key);

        mCarrierConfigManager = new CarrierConfigManager(context);

        mDpcApnEnforcedObserver = new DpcApnEnforcedObserver(new Handler(Looper.getMainLooper()));

    }



    @Override

    public int getAvailabilityStatus() {

        final PersistableBundle carrierConfig = mCarrierConfigManager.getConfigForSubId(mSubId);

        final boolean isCdmaApn = MobileNetworkUtils.isCdmaOptions(mContext, mSubId)

                && carrierConfig.getBoolean(CarrierConfigManager.KEY_SHOW_APN_SETTING_CDMA_BOOL);

        final boolean isGsmApn = MobileNetworkUtils.isGsmOptions(mContext, mSubId)

                && carrierConfig.getBoolean(CarrierConfigManager.KEY_APN_EXPAND_BOOL);



        return carrierConfig != null

                && carrierConfig.getBoolean(CarrierConfigManager.KEY_SHOW_APN_SETTING_CDMA_BOOL)

                && MobileNetworkUtils.isCdmaOptions(mContext, mSubId)

                && (isCdmaApn || isGsmApn)

                ? AVAILABLE

                : CONDITIONALLY_UNAVAILABLE;

    }



    @Override

    public void onStart() {

        mDpcApnEnforcedObserver.register(mContext);

    }



    @Override

    public void onStop() {

        mDpcApnEnforcedObserver.unRegister(mContext);

    }



    @Override

    public void displayPreference(PreferenceScreen screen) {

        super.displayPreference(screen);

        if (isAvailable()) {

        mPreference = screen.findPreference(getPreferenceKey());

    }



    @Override

    public void updateState(Preference preference) {

        super.updateState(preference);

        ((RestrictedPreference) mPreference).setDisabledByAdmin(

                MobileNetworkUtils.isDpcApnEnforced(mContext)

                        ? RestrictedLockUtilsInternal.getDeviceOwner(mContext)

                        : null);

        } else {

            screen.findPreference(CATEGORY_KEY).setVisible(false);

        }

    }



    @Override
@@ -84,4 +111,33 @@ public class CdmaApnPreferenceController extends CdmaBasePreferenceController { 


        return false;

    }



    public void init(int subId) {

        mSubId = subId;

    }



    @VisibleForTesting

    void setPreference(Preference preference) {

        mPreference = preference;

    }



    private class DpcApnEnforcedObserver extends ContentObserver {

        DpcApnEnforcedObserver(Handler handler) {

            super(handler);

        }



        public void register(Context context) {

            context.getContentResolver().registerContentObserver(ENFORCE_MANAGED_URI, false, this);



        }



        public void unRegister(Context context) {

            context.getContentResolver().unregisterContentObserver(this);

        }



        @Override

        public void onChange(boolean selfChange) {

            updateState(mPreference);

        }

    }

}

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

deleted100644 → 0
+0 −180
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2018 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.settings.network.telephony;



import android.content.Context;

import android.content.Intent;

import android.os.PersistableBundle;

import android.provider.Settings;

import android.telephony.CarrierConfigManager;

import android.telephony.TelephonyManager;



import androidx.preference.Preference;

import androidx.preference.PreferenceFragmentCompat;

import androidx.preference.PreferenceScreen;



import com.android.internal.logging.MetricsLogger;

import com.android.internal.logging.nano.MetricsProto.MetricsEvent;

import com.android.internal.telephony.Phone;

import com.android.internal.telephony.PhoneConstants;

import com.android.settings.R;

import com.android.settingslib.RestrictedLockUtilsInternal;

import com.android.settingslib.RestrictedPreference;



/**

 * List of Network-specific settings screens.

 */

public class GsmUmtsOptions {

    private static final String LOG_TAG = "GsmUmtsOptions";



    private CarrierConfigManager mCarrierConfigManager;

    private RestrictedPreference mButtonAPNExpand;

    private Preference mCategoryAPNExpand;

    Preference mCarrierSettingPref;



    private NetworkOperators mNetworkOperator;



    private static final String BUTTON_APN_EXPAND_KEY = "button_gsm_apn_key";

    private static final String CATEGORY_APN_EXPAND_KEY = "category_gsm_apn_key";

    private static final String BUTTON_CARRIER_SETTINGS_KEY = "carrier_settings_key";



    public static final String EXTRA_SUB_ID = "sub_id";

    private PreferenceFragmentCompat mPrefFragment;

    private PreferenceScreen mPrefScreen;



    public GsmUmtsOptions(PreferenceFragmentCompat prefFragment, PreferenceScreen prefScreen,

            final int subId) {

        final Context context = prefFragment.getContext();

        mPrefFragment = prefFragment;

        mPrefScreen = prefScreen;

        mCarrierConfigManager = new CarrierConfigManager(context);

        mPrefFragment.addPreferencesFromResource(R.xml.gsm_umts_options);

        mButtonAPNExpand = (RestrictedPreference) mPrefScreen.findPreference(BUTTON_APN_EXPAND_KEY);

        mCategoryAPNExpand = mPrefScreen.findPreference(CATEGORY_APN_EXPAND_KEY);

        mNetworkOperator = (NetworkOperators) mPrefScreen

                .findPreference(NetworkOperators.CATEGORY_NETWORK_OPERATORS_KEY);

        mCarrierSettingPref = mPrefScreen.findPreference(BUTTON_CARRIER_SETTINGS_KEY);



        mNetworkOperator.initialize();



        update(subId);

    }



    // Unlike mPrefFragment or mPrefScreen, subId  may change during lifecycle of GsmUmtsOptions.

    // When that happens, we update GsmUmtsOptions with new parameters.

    protected void update(final int subId) {

        boolean addAPNExpand = true;

        boolean addNetworkOperatorsCategory = true;

        boolean addCarrierSettings = true;

        final TelephonyManager telephonyManager = TelephonyManager.from(mPrefFragment.getContext())

                .createForSubscriptionId(subId);

        //TODO(b/115429509): Get phone from subId

        Phone phone = null;

        if (phone == null) return;

        if (telephonyManager.getPhoneType() != PhoneConstants.PHONE_TYPE_GSM) {

            log("Not a GSM phone");

            addAPNExpand = false;

            mNetworkOperator.setEnabled(false);

        } else {

            log("Not a CDMA phone");

            PersistableBundle carrierConfig = mCarrierConfigManager.getConfigForSubId(subId);



            // Determine which options to display. For GSM these are defaulted to true in

            // CarrierConfigManager, but they maybe overriden by DefaultCarrierConfigService or a

            // carrier app.

            // Note: these settings used to be controlled with overlays in

            // Telephony/res/values/config.xml

            if (!carrierConfig.getBoolean(CarrierConfigManager.KEY_APN_EXPAND_BOOL)

                    && mCategoryAPNExpand != null) {

                addAPNExpand = false;

            }

            if (!carrierConfig.getBoolean(

                    CarrierConfigManager.KEY_OPERATOR_SELECTION_EXPAND_BOOL)) {

                addNetworkOperatorsCategory = false;

            }



            if (carrierConfig.getBoolean(CarrierConfigManager.KEY_CSP_ENABLED_BOOL)) {

                if (phone.isCspPlmnEnabled()) {

                    log("[CSP] Enabling Operator Selection menu.");

                    mNetworkOperator.setEnabled(true);

                } else {

                    log("[CSP] Disabling Operator Selection menu.");

                    addNetworkOperatorsCategory = false;

                }

            }



            // Read platform settings for carrier settings

            addCarrierSettings = carrierConfig.getBoolean(

                    CarrierConfigManager.KEY_CARRIER_SETTINGS_ENABLE_BOOL);

        }



        // Making no assumptions of whether they are added or removed at this point.

        // Calling add or remove explicitly to make sure they are updated.



        if (addAPNExpand) {

            log("update: addAPNExpand");

            mButtonAPNExpand.setDisabledByAdmin(

                    MobileNetworkUtils.isDpcApnEnforced(mButtonAPNExpand.getContext())

                            ? RestrictedLockUtilsInternal.getDeviceOwner(

                            mButtonAPNExpand.getContext())

                            : null);

            mButtonAPNExpand.setOnPreferenceClickListener(

                    new Preference.OnPreferenceClickListener() {

                        @Override

                        public boolean onPreferenceClick(Preference preference) {

                            MetricsLogger.action(mButtonAPNExpand.getContext(),

                                    MetricsEvent.ACTION_MOBILE_NETWORK_APN_SETTINGS);

                            // We need to build the Intent by hand as the Preference Framework

                            // does not allow to add an Intent with some extras into a Preference

                            // XML file

                            final Intent intent = new Intent(Settings.ACTION_APN_SETTINGS);

                            // This will setup the Home and Search affordance

                            intent.putExtra(":settings:show_fragment_as_subsetting", true);

                            intent.putExtra(EXTRA_SUB_ID, subId);

                            mPrefFragment.startActivity(intent);

                            return true;

                        }

                    });

            mPrefScreen.addPreference(mCategoryAPNExpand);

        } else {

            mPrefScreen.removePreference(mCategoryAPNExpand);

        }



        if (addNetworkOperatorsCategory) {

            mPrefScreen.addPreference(mNetworkOperator);

            mNetworkOperator.update(subId);

        } else {

            mPrefScreen.removePreference(mNetworkOperator);

        }



        if (addCarrierSettings) {

            mPrefScreen.addPreference(mCarrierSettingPref);

        } else {

            mPrefScreen.removePreference(mCarrierSettingPref);

        }



    }



    protected boolean preferenceTreeClick(Preference preference) {

        return mNetworkOperator.preferenceTreeClick(preference);

    }



    protected void log(String s) {

        android.util.Log.d(LOG_TAG, s);

    }

}

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

+14 −48
Original line number Diff line number Diff line
@@ -45,7 +45,6 @@ import android.view.MenuItem; 
import androidx.annotation.VisibleForTesting;

import androidx.fragment.app.FragmentActivity;

import androidx.preference.Preference;

import androidx.preference.PreferenceCategory;

import androidx.preference.PreferenceFragmentCompat;

import androidx.preference.PreferenceScreen;
@@ -57,14 +56,17 @@ import com.android.internal.telephony.PhoneConstants; 
import com.android.internal.telephony.TelephonyIntents;

import com.android.settings.R;

import com.android.settings.dashboard.DashboardFragment;

import com.android.settings.network.telephony.cdma.CdmaApnPreferenceController;

import com.android.settings.network.telephony.cdma.CdmaSubscriptionPreferenceController;

import com.android.settings.network.telephony.cdma.CdmaSystemSelectPreferenceController;

import com.android.settings.network.telephony.gsm.AutoSelectPreferenceController;

import com.android.settings.network.telephony.gsm.OpenNetworkSelectPagePreferenceController;

import com.android.settings.search.BaseSearchIndexProvider;

import com.android.settings.search.Indexable;

import com.android.settings.widget.PreferenceCategoryController;

import com.android.settingslib.search.SearchIndexable;



import java.util.ArrayList;

import java.util.Arrays;

import java.util.List;



@SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC)
@@ -125,9 +127,6 @@ public class MobileNetworkFragment extends DashboardFragment implements 
    private ImsManager mImsMgr;

    private boolean mOkClicked;



    //GsmUmts options and Cdma options

    GsmUmtsOptions mGsmUmtsOptions;



    private String mClickedPrefKey;

    private boolean mShow4GForLTE;

    private boolean mIsGlobalCdma;
@@ -156,9 +155,6 @@ public class MobileNetworkFragment extends DashboardFragment implements 
        /** TODO: Refactor and get rid of the if's using subclasses */

        if (preference.getKey().equals(BUTTON_4G_LTE_KEY)) {

            return true;

        } else if (mGsmUmtsOptions != null &&

                mGsmUmtsOptions.preferenceTreeClick(preference) == true) {

            return true;

        } else if (TextUtils.equals(key, BUTTON_CDMA_SYSTEM_SELECT_KEY)

                || TextUtils.equals(key, BUTTON_CDMA_SUBSCRIPTION_KEY)) {

            if (mTelephonyManager.getEmergencyCallbackMode()) {
@@ -210,7 +206,7 @@ public class MobileNetworkFragment extends DashboardFragment implements 


        use(MobileDataPreferenceController.class).init(getFragmentManager(), mSubId);

        use(RoamingPreferenceController.class).init(getFragmentManager(), mSubId);

        use(CdmaApnPreferenceController.class).init(mSubId);

        use(ApnPreferenceController.class).init(mSubId);

        use(CarrierPreferenceController.class).init(mSubId);

        use(DataUsagePreferenceController.class).init(mSubId);

        use(PreferredNetworkModePreferenceController.class).init(mSubId);
@@ -219,6 +215,15 @@ public class MobileNetworkFragment extends DashboardFragment implements 
        use(EuiccPreferenceController.class).init(mSubId);

        use(WifiCallingPreferenceController.class).init(mSubId);



        final OpenNetworkSelectPagePreferenceController openNetworkSelectPagePreferenceController =

                use(OpenNetworkSelectPagePreferenceController.class).init(mSubId);

        final AutoSelectPreferenceController autoSelectPreferenceController =

                use(AutoSelectPreferenceController.class)

                        .init(mSubId)

                        .addListener(openNetworkSelectPagePreferenceController);

        use(PreferenceCategoryController.class).setChildren(

                Arrays.asList(autoSelectPreferenceController));



        mCdmaSystemSelectPreferenceController = use(CdmaSystemSelectPreferenceController.class);

        mCdmaSystemSelectPreferenceController.init(getPreferenceManager(), mSubId);

        mCdmaSubscriptionPreferenceController = use(CdmaSubscriptionPreferenceController.class);
@@ -468,10 +473,6 @@ public class MobileNetworkFragment extends DashboardFragment implements 
        if (ps != null) {

            ps.setEnabled(hasActiveSubscriptions);

        }

        ps = findPreference(NetworkOperators.CATEGORY_NETWORK_OPERATORS_KEY);

        if (ps != null) {

            ps.setEnabled(hasActiveSubscriptions);

        }

        ps = findPreference(BUTTON_CARRIER_SETTINGS_KEY);

        if (ps != null) {

            ps.setEnabled(hasActiveSubscriptions);
@@ -480,20 +481,6 @@ public class MobileNetworkFragment extends DashboardFragment implements 
        if (ps != null) {

            ps.setEnabled(hasActiveSubscriptions);

        }

        ps = findPreference(NetworkOperators.BUTTON_AUTO_SELECT_KEY);

        if (ps != null) {

            ps.setSummary(null);

            if (mTelephonyManager.getServiceState().getRoaming()) {

                ps.setEnabled(true);

            } else {

                ps.setEnabled(!mOnlyAutoSelectInHomeNW);

                if (mOnlyAutoSelectInHomeNW) {

                    ps.setSummary(getResources().getString(

                            R.string.manual_mode_disallowed_summary,

                            mTelephonyManager.getSimOperatorName()));

                }

            }

        }

    }



    @Override
@@ -605,17 +592,7 @@ public class MobileNetworkFragment extends DashboardFragment implements 


        updateGsmUmtsOptions(this, prefSet, mSubId);



        PreferenceCategory networkOperatorCategory =

                (PreferenceCategory) prefSet.findPreference(

                        NetworkOperators.CATEGORY_NETWORK_OPERATORS_KEY);

        Preference carrierSettings = prefSet.findPreference(BUTTON_CARRIER_SETTINGS_KEY);

        if (networkOperatorCategory != null) {

            if (enable) {

                networkOperatorCategory.setEnabled(true);

            } else {

                prefSet.removePreference(networkOperatorCategory);

            }

        }

        if (carrierSettings != null) {

            prefSet.removePreference(carrierSettings);

        }
@@ -688,12 +665,6 @@ public class MobileNetworkFragment extends DashboardFragment implements 


        if (preference == null) {

            return MetricsProto.MetricsEvent.VIEW_UNKNOWN;

        } else if (preference == preferenceScreen

                .findPreference(NetworkOperators.BUTTON_AUTO_SELECT_KEY)) {

            return MetricsProto.MetricsEvent.ACTION_MOBILE_NETWORK_AUTO_SELECT_NETWORK_TOGGLE;

        } else if (preference == preferenceScreen

                .findPreference(NetworkOperators.BUTTON_NETWORK_SELECT_KEY)) {

            return MetricsProto.MetricsEvent.ACTION_MOBILE_NETWORK_MANUAL_SELECT_NETWORK;

        } else if (preference == preferenceScreen

                .findPreference(BUTTON_CDMA_SYSTEM_SELECT_KEY)) {

            return MetricsProto.MetricsEvent.ACTION_MOBILE_NETWORK_CDMA_SYSTEM_SELECT;
@@ -715,11 +686,6 @@ public class MobileNetworkFragment extends DashboardFragment implements 
        // We don't want to re-create GsmUmtsOptions if already exists. Otherwise, the

        // preferences inside it will also be re-created which causes unexpected behavior.

        // For example, the open dialog gets dismissed or detached after pause / resume.

        if (mGsmUmtsOptions == null) {

            mGsmUmtsOptions = new GsmUmtsOptions(prefFragment, prefScreen, subId);

        } else {

            mGsmUmtsOptions.update(subId);

        }

    }



    private static Intent buildPhoneAccountConfigureIntent(