From 1377be23231cdaf380a0312188c45fa80ee811c6 Mon Sep 17 00:00:00 2001 From: David Jacobo Date: Fri, 24 May 2024 23:46:13 +0000 Subject: [PATCH] Revert "settings: Make use of ACTION_NETWORK_PROVIDER_SETTINGS" Revert submission 27019285-ACTION_NETWORK_PROVIDER_SETTINGS Reason for revert: b/338527563 CL seems to be introducing jank for systemui tests somehow, reverting to get out of the way Reverted changes: /q/submissionid:27019285-ACTION_NETWORK_PROVIDER_SETTINGS Change-Id: I48bc0f4efc22dbff9f983b4606442b3ebd6d584c --- .../android/settings/network/NetworkProviderSettings.java | 5 +++++ .../com/android/settings/network/ProviderModelSliceTest.java | 3 +-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/com/android/settings/network/NetworkProviderSettings.java b/src/com/android/settings/network/NetworkProviderSettings.java index a4193f8219c..6abe52bb5b4 100644 --- a/src/com/android/settings/network/NetworkProviderSettings.java +++ b/src/com/android/settings/network/NetworkProviderSettings.java @@ -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; diff --git a/tests/unit/src/com/android/settings/network/ProviderModelSliceTest.java b/tests/unit/src/com/android/settings/network/ProviderModelSliceTest.java index 7534845223a..345631cf5f6 100644 --- a/tests/unit/src/com/android/settings/network/ProviderModelSliceTest.java +++ b/tests/unit/src/com/android/settings/network/ProviderModelSliceTest.java @@ -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 */);