Merge "Revert "Settings: add ACTION_NETWORK_PROVIDER_SETTINGS"" into main (2b83c174) · Commits · e / os / android_frameworks_base

core/java/android/provider/Settings.java

+0 −18

Original line number	Diff line number	Diff line
		@@ -1735,24 +1735,6 @@ public final class Settings {
		public static final String ACTION_NETWORK_OPERATOR_SETTINGS =
		"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>

+3 −2

Original line number	Diff line number	Diff line
		@@ -118,6 +118,8 @@ import javax.inject.Inject;
		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 @@ public class InternetDialogController implements AccessPointController.AccessPoi

		@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