Merge "settings: Make use of ACTION_NETWORK_PROVIDER_SETTINGS" into main

/**

 * UI for Mobile network and Wi-Fi network settings.

 *

 * TODO(b/167474581): Define the intent android.settings.NETWORK_PROVIDER_SETTINGS in Settings.java.

 */

@SearchIndexable

public class NetworkProviderSettings extends RestrictedSettingsFragment

        WifiDialog2.WifiDialog2Listener, DialogInterface.OnDismissListener,

        AirplaneModeEnabler.OnAirplaneModeChangedListener, InternetUpdater.InternetChangeListener {

    public static final String ACTION_NETWORK_PROVIDER_SETTINGS =

            "android.settings.NETWORK_PROVIDER_SETTINGS";

    private static final String TAG = "NetworkProviderSettings";

    // IDs of context menu

    static final int MENU_ID_CONNECT = Menu.FIRST + 1;

import android.net.Uri;

import android.net.wifi.WifiManager;

import android.os.UserManager;

import android.provider.Settings;

import android.telephony.SubscriptionManager;

import android.telephony.TelephonyManager;

    }

    private PendingIntent getPrimaryAction() {

        final Intent intent = new Intent("android.settings.NETWORK_PROVIDER_SETTINGS")

        final Intent intent = new Intent(Settings.ACTION_NETWORK_PROVIDER_SETTINGS)

                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);

        return PendingIntent.getActivity(mContext, 0 /* requestCode */,

                intent, PendingIntent.FLAG_IMMUTABLE /* flags */);