From 19a96c7cbd1f93ea5e8e193f2d8d97d91d7aaad6 Mon Sep 17 00:00:00 2001 From: David Jacobo Date: Tue, 4 Jun 2024 22:35:00 +0000 Subject: [PATCH] Revert "Revert "settings: Make use of ACTION_NETWORK_PROVIDER_SE..." Revert submission 27518747-revert-27019285-ACTION_NETWORK_PROVIDER_SETTINGS-UWYYODXDGG Reason for revert: per b/338527563#comment37, this was wrongly pointed out as culprit, looping folks conducting investigation as +cc Reverted changes: /q/submissionid:27518747-revert-27019285-ACTION_NETWORK_PROVIDER_SETTINGS-UWYYODXDGG Change-Id: Id3dfdac978227d0fd065f1eb59b525f041fad3d2 --- .../android/settings/network/NetworkProviderSettings.java | 5 ----- .../com/android/settings/network/ProviderModelSliceTest.java | 3 ++- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/com/android/settings/network/NetworkProviderSettings.java b/src/com/android/settings/network/NetworkProviderSettings.java index 6abe52bb5b4..a4193f8219c 100644 --- a/src/com/android/settings/network/NetworkProviderSettings.java +++ b/src/com/android/settings/network/NetworkProviderSettings.java @@ -99,8 +99,6 @@ 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 @@ -108,9 +106,6 @@ 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; diff --git a/tests/unit/src/com/android/settings/network/ProviderModelSliceTest.java b/tests/unit/src/com/android/settings/network/ProviderModelSliceTest.java index 345631cf5f6..7534845223a 100644 --- a/tests/unit/src/com/android/settings/network/ProviderModelSliceTest.java +++ b/tests/unit/src/com/android/settings/network/ProviderModelSliceTest.java @@ -43,6 +43,7 @@ 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; @@ -390,7 +391,7 @@ public class ProviderModelSliceTest { } 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 */);