PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert "Revert "settings: Make use of ACTION_NETWORK_PROVIDER_SE..."" into main

Browse Source
This commit is contained in:
Treehugger Robot
2024-06-05 03:17:36 +00:00
committed by Android (Google) Code Review
parent 03e59a0827 19a96c7cbd
commit e0bccf1d5c
2 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/network/NetworkProviderSettings.java
View File

@@ -99,8 +99,6 @@ import java.util.Optional;
/** /**
* UI for Mobile network and Wi-Fi network settings. * UI for Mobile network and Wi-Fi network settings.
*
* TODO(b/167474581): Define the intent android.settings.NETWORK_PROVIDER_SETTINGS in Settings.java.
*/ */
@SearchIndexable @SearchIndexable
public class NetworkProviderSettings extends RestrictedSettingsFragment public class NetworkProviderSettings extends RestrictedSettingsFragment
@@ -108,9 +106,6 @@ public class NetworkProviderSettings extends RestrictedSettingsFragment
WifiDialog2.WifiDialog2Listener, DialogInterface.OnDismissListener, WifiDialog2.WifiDialog2Listener, DialogInterface.OnDismissListener,
AirplaneModeEnabler.OnAirplaneModeChangedListener, InternetUpdater.InternetChangeListener { AirplaneModeEnabler.OnAirplaneModeChangedListener, InternetUpdater.InternetChangeListener {
public static final String ACTION_NETWORK_PROVIDER_SETTINGS =
"android.settings.NETWORK_PROVIDER_SETTINGS";
private static final String TAG = "NetworkProviderSettings"; private static final String TAG = "NetworkProviderSettings";
// IDs of context menu // IDs of context menu
static final int MENU_ID_CONNECT = Menu.FIRST + 1; static final int MENU_ID_CONNECT = Menu.FIRST + 1;

3
tests/unit/src/com/android/settings/network/ProviderModelSliceTest.java
View File

@@ -43,6 +43,7 @@ import android.net.ConnectivityManager;
import android.net.Uri; import android.net.Uri;
import android.net.wifi.WifiManager; import android.net.wifi.WifiManager;
import android.os.UserManager; import android.os.UserManager;
import android.provider.Settings;
import android.telephony.SubscriptionManager; import android.telephony.SubscriptionManager;
import android.telephony.TelephonyManager; import android.telephony.TelephonyManager;
@@ -390,7 +391,7 @@ public class ProviderModelSliceTest {
} }
private PendingIntent getPrimaryAction() { 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); .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
return PendingIntent.getActivity(mContext, 0 /* requestCode */, return PendingIntent.getActivity(mContext, 0 /* requestCode */,
intent, PendingIntent.FLAG_IMMUTABLE /* flags */); intent, PendingIntent.FLAG_IMMUTABLE /* flags */);