Revert "Settings: add 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: Iee77e2443420d57e36a9164969c35e839ef07e9c
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index a409537..f357ebf 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -1736,24 +1736,6 @@
"android.settings.NETWORK_OPERATOR_SETTINGS";
/**
- * Activity Action: Show settings for selecting the network provider.
- * <p>
- * In some cases, a matching Activity may not be provided, so ensure you
- * safeguard against this.
- * <p>
- * Access to this preference can be customized via Settings' app.
- * <p>
- * Input: Nothing.
- * <p>
- * Output: Nothing.
- *
- * @hide
- */
- @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)
- public static final String ACTION_NETWORK_PROVIDER_SETTINGS =
- "android.settings.NETWORK_PROVIDER_SETTINGS";
-
- /**
* Activity Action: Show settings for selection of 2G/3G.
* <p>
* In some cases, a matching Activity may not exist, so ensure you
diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDialogController.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDialogController.java
index b057476..7bc76af 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDialogController.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/dialog/InternetDialogController.java
@@ -118,6 +118,8 @@
public class InternetDialogController implements AccessPointController.AccessPointCallback {
private static final String TAG = "InternetDialogController";
+ private static final String ACTION_NETWORK_PROVIDER_SETTINGS =
+ "android.settings.NETWORK_PROVIDER_SETTINGS";
private static final String ACTION_WIFI_SCANNING_SETTINGS =
"android.settings.WIFI_SCANNING_SETTINGS";
/**
@@ -361,8 +363,7 @@
@VisibleForTesting
protected Intent getSettingsIntent() {
- return new Intent(Settings.ACTION_NETWORK_PROVIDER_SETTINGS).addFlags(
- Intent.FLAG_ACTIVITY_NEW_TASK);
+ return new Intent(ACTION_NETWORK_PROVIDER_SETTINGS).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
}
@Nullable