Merge "Remove ACTION_CONFIGURE_WIFI_SETTINGS and ACTION_WIFI_SAVED_NETWORK_SETTINGS." (15e3d0db) · Commits · e / os / android_frameworks_base

api/system-current.txt

+0 −2

Original line number	Diff line number	Diff line
		@@ -37760,7 +37760,6 @@ package android.provider {
		field public static final java.lang.String ACTION_CAPTIONING_SETTINGS = "android.settings.CAPTIONING_SETTINGS";
		field public static final java.lang.String ACTION_CAST_SETTINGS = "android.settings.CAST_SETTINGS";
		field public static final java.lang.String ACTION_CHANNEL_NOTIFICATION_SETTINGS = "android.settings.CHANNEL_NOTIFICATION_SETTINGS";
		field public static final java.lang.String ACTION_CONFIGURE_WIFI_SETTINGS = "android.settings.CONFIGURE_WIFI_SETTINGS";
		field public static final java.lang.String ACTION_DATA_ROAMING_SETTINGS = "android.settings.DATA_ROAMING_SETTINGS";
		field public static final java.lang.String ACTION_DATE_SETTINGS = "android.settings.DATE_SETTINGS";
		field public static final java.lang.String ACTION_DEVICE_INFO_SETTINGS = "android.settings.DEVICE_INFO_SETTINGS";
		@@ -37810,7 +37809,6 @@ package android.provider {
		field public static final java.lang.String ACTION_VR_LISTENER_SETTINGS = "android.settings.VR_LISTENER_SETTINGS";
		field public static final java.lang.String ACTION_WEBVIEW_SETTINGS = "android.settings.WEBVIEW_SETTINGS";
		field public static final java.lang.String ACTION_WIFI_IP_SETTINGS = "android.settings.WIFI_IP_SETTINGS";
		field public static final java.lang.String ACTION_WIFI_SAVED_NETWORK_SETTINGS = "android.settings.WIFI_SAVED_NETWORK_SETTINGS";
		field public static final java.lang.String ACTION_WIFI_SETTINGS = "android.settings.WIFI_SETTINGS";
		field public static final java.lang.String ACTION_WIRELESS_SETTINGS = "android.settings.WIRELESS_SETTINGS";
		field public static final java.lang.String ACTION_ZEN_MODE_PRIORITY_SETTINGS = "android.settings.ZEN_MODE_PRIORITY_SETTINGS";

core/java/android/provider/Settings.java

+0 −32

Original line number	Diff line number	Diff line
		@@ -395,38 +395,6 @@ public final class Settings {
		public static final String ACTION_WIFI_IP_SETTINGS =
		"android.settings.WIFI_IP_SETTINGS";

		/**
		* Activity Action: Show settings to allow the configuration of Wi-Fi features.
		* <p>
		* In some cases, a matching Activity may not exist, so ensure you
		* safeguard against this.
		* <p>
		* Input: Nothing.
		* <p>
		* Output: Nothing.
		* @hide
		*/
		@SystemApi
		@SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)
		public static final String ACTION_CONFIGURE_WIFI_SETTINGS =
		"android.settings.CONFIGURE_WIFI_SETTINGS";

		/**
		* Activity Action: Show settings to allow configuration of Wi-Fi saved networks.
		* <p>
		* In some cases, a matching Activity may not exist, so ensure you
		* safeguard against this.
		* <p>
		* Input: Nothing.
		* <p>
		* Output: Nothing.
		* @hide
		*/
		@SystemApi
		@SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)
		public static final String ACTION_WIFI_SAVED_NETWORK_SETTINGS =
		"android.settings.WIFI_SAVED_NETWORK_SETTINGS";

		/**
		* Activity Action: Show settings to allow configuration of Bluetooth.
		* <p>

core/tests/coretests/src/android/provider/SettingsProviderTest.java

+0 −1

Original line number	Diff line number	Diff line
		@@ -349,7 +349,6 @@ public class SettingsProviderTest extends AndroidTestCase {
		assertCanBeHandled(new Intent(Settings.ACTION_USER_DICTIONARY_SETTINGS));
		assertCanBeHandled(new Intent(Settings.ACTION_WIFI_IP_SETTINGS));
		assertCanBeHandled(new Intent(Settings.ACTION_WIFI_SETTINGS));
		assertCanBeHandled(new Intent(Settings.ACTION_WIFI_SAVED_NETWORK_SETTINGS));
		assertCanBeHandled(new Intent(Settings.ACTION_WIRELESS_SETTINGS));

		if (mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_DEVICE_ADMIN)) {