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

Commit 7b986e7e authored by David Jacobo's avatar David Jacobo Committed by Android (Google) Code Review
Browse files

Merge "Revert "settings: Make use of ACTION_NETWORK_PROVIDER_SETTINGS"" into main

parents 593ab5ee 1377be23

src/com/android/settings/network/NetworkProviderSettings.java

+5 −0
Original line number Diff line number Diff line
@@ -99,6 +99,8 @@ import java.util.Optional; 


/**

 * 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
@@ -106,6 +108,9 @@ 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;

tests/unit/src/com/android/settings/network/ProviderModelSliceTest.java

+1 −2
Original line number Diff line number Diff line
@@ -43,7 +43,6 @@ import android.net.ConnectivityManager; 
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;
@@ -391,7 +390,7 @@ public class ProviderModelSliceTest { 
    }



    private PendingIntent getPrimaryAction() {

        final Intent intent = new Intent(Settings.ACTION_NETWORK_PROVIDER_SETTINGS)

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

                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);

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

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