Merge changes from topic 'hide_passpoint_r2' into oc-dev am: 4bd47fce86 (66197daa) · Commits · e / os / android_frameworks_base

api/current.txt

+0 −13

Original line number	Diff line number	Diff line
		@@ -26534,7 +26534,6 @@ package android.net.wifi {
		method public boolean isTdlsSupported();
		method public boolean isWifiEnabled();
		method public deprecated boolean pingSupplicant();
		method public void queryPasspointIcon(long, java.lang.String);
		method public boolean reassociate();
		method public boolean reconnect();
		method public boolean removeNetwork(int);
		@@ -26547,29 +26546,17 @@ package android.net.wifi {
		method public boolean startScan();
		method public void startWps(android.net.wifi.WpsInfo, android.net.wifi.WifiManager.WpsCallback);
		method public int updateNetwork(android.net.wifi.WifiConfiguration);
		field public static final java.lang.String ACTION_PASSPOINT_DEAUTH_IMMINENT = "android.net.wifi.action.PASSPOINT_DEAUTH_IMMINENT";
		field public static final java.lang.String ACTION_PASSPOINT_ICON = "android.net.wifi.action.PASSPOINT_ICON";
		field public static final java.lang.String ACTION_PASSPOINT_OSU_PROVIDERS_LIST = "android.net.wifi.action.PASSPOINT_OSU_PROVIDERS_LIST";
		field public static final java.lang.String ACTION_PASSPOINT_SUBSCRIPTION_REMEDIATION = "android.net.wifi.action.PASSPOINT_SUBSCRIPTION_REMEDIATION";
		field public static final java.lang.String ACTION_PICK_WIFI_NETWORK = "android.net.wifi.PICK_WIFI_NETWORK";
		field public static final java.lang.String ACTION_REQUEST_SCAN_ALWAYS_AVAILABLE = "android.net.wifi.action.REQUEST_SCAN_ALWAYS_AVAILABLE";
		field public static final int ERROR_AUTHENTICATING = 1; // 0x1
		field public static final java.lang.String EXTRA_ANQP_ELEMENT_DATA = "android.net.wifi.extra.ANQP_ELEMENT_DATA";
		field public static final java.lang.String EXTRA_BSSID = "bssid";
		field public static final java.lang.String EXTRA_BSSID_LONG = "android.net.wifi.extra.BSSID_LONG";
		field public static final java.lang.String EXTRA_DELAY = "android.net.wifi.extra.DELAY";
		field public static final java.lang.String EXTRA_ESS = "android.net.wifi.extra.ESS";
		field public static final java.lang.String EXTRA_FILENAME = "android.net.wifi.extra.FILENAME";
		field public static final java.lang.String EXTRA_ICON = "android.net.wifi.extra.ICON";
		field public static final java.lang.String EXTRA_NETWORK_INFO = "networkInfo";
		field public static final java.lang.String EXTRA_NEW_RSSI = "newRssi";
		field public static final java.lang.String EXTRA_NEW_STATE = "newState";
		field public static final java.lang.String EXTRA_PREVIOUS_WIFI_STATE = "previous_wifi_state";
		field public static final java.lang.String EXTRA_RESULTS_UPDATED = "resultsUpdated";
		field public static final java.lang.String EXTRA_SUBSCRIPTION_REMEDIATION_METHOD = "android.net.wifi.extra.SUBSCRIPTION_REMEDIATION_METHOD";
		field public static final java.lang.String EXTRA_SUPPLICANT_CONNECTED = "connected";
		field public static final java.lang.String EXTRA_SUPPLICANT_ERROR = "supplicantError";
		field public static final java.lang.String EXTRA_URL = "android.net.wifi.extra.URL";
		field public static final java.lang.String EXTRA_WIFI_INFO = "wifiInfo";
		field public static final java.lang.String EXTRA_WIFI_STATE = "wifi_state";
		field public static final java.lang.String NETWORK_IDS_CHANGED_ACTION = "android.net.wifi.NETWORK_IDS_CHANGED";

api/system-current.txt

+0 −13

Original line number	Diff line number	Diff line
		@@ -29066,7 +29066,6 @@ package android.net.wifi {
		method public boolean isWifiEnabled();
		method public boolean isWifiScannerSupported();
		method public deprecated boolean pingSupplicant();
		method public void queryPasspointIcon(long, java.lang.String);
		method public boolean reassociate();
		method public boolean reconnect();
		method public boolean removeNetwork(int);
		@@ -29083,10 +29082,6 @@ package android.net.wifi {
		method public boolean startScan(android.os.WorkSource);
		method public void startWps(android.net.wifi.WpsInfo, android.net.wifi.WifiManager.WpsCallback);
		method public int updateNetwork(android.net.wifi.WifiConfiguration);
		field public static final java.lang.String ACTION_PASSPOINT_DEAUTH_IMMINENT = "android.net.wifi.action.PASSPOINT_DEAUTH_IMMINENT";
		field public static final java.lang.String ACTION_PASSPOINT_ICON = "android.net.wifi.action.PASSPOINT_ICON";
		field public static final java.lang.String ACTION_PASSPOINT_OSU_PROVIDERS_LIST = "android.net.wifi.action.PASSPOINT_OSU_PROVIDERS_LIST";
		field public static final java.lang.String ACTION_PASSPOINT_SUBSCRIPTION_REMEDIATION = "android.net.wifi.action.PASSPOINT_SUBSCRIPTION_REMEDIATION";
		field public static final java.lang.String ACTION_PICK_WIFI_NETWORK = "android.net.wifi.PICK_WIFI_NETWORK";
		field public static final java.lang.String ACTION_REQUEST_SCAN_ALWAYS_AVAILABLE = "android.net.wifi.action.REQUEST_SCAN_ALWAYS_AVAILABLE";
		field public static final int CHANGE_REASON_ADDED = 0; // 0x0
		@@ -29094,14 +29089,8 @@ package android.net.wifi {
		field public static final int CHANGE_REASON_REMOVED = 1; // 0x1
		field public static final java.lang.String CONFIGURED_NETWORKS_CHANGED_ACTION = "android.net.wifi.CONFIGURED_NETWORKS_CHANGE";
		field public static final int ERROR_AUTHENTICATING = 1; // 0x1
		field public static final java.lang.String EXTRA_ANQP_ELEMENT_DATA = "android.net.wifi.extra.ANQP_ELEMENT_DATA";
		field public static final java.lang.String EXTRA_BSSID = "bssid";
		field public static final java.lang.String EXTRA_BSSID_LONG = "android.net.wifi.extra.BSSID_LONG";
		field public static final java.lang.String EXTRA_CHANGE_REASON = "changeReason";
		field public static final java.lang.String EXTRA_DELAY = "android.net.wifi.extra.DELAY";
		field public static final java.lang.String EXTRA_ESS = "android.net.wifi.extra.ESS";
		field public static final java.lang.String EXTRA_FILENAME = "android.net.wifi.extra.FILENAME";
		field public static final java.lang.String EXTRA_ICON = "android.net.wifi.extra.ICON";
		field public static final java.lang.String EXTRA_MULTIPLE_NETWORKS_CHANGED = "multipleChanges";
		field public static final java.lang.String EXTRA_NETWORK_INFO = "networkInfo";
		field public static final java.lang.String EXTRA_NEW_RSSI = "newRssi";
		@@ -29109,10 +29098,8 @@ package android.net.wifi {
		field public static final java.lang.String EXTRA_PREVIOUS_WIFI_AP_STATE = "previous_wifi_state";
		field public static final java.lang.String EXTRA_PREVIOUS_WIFI_STATE = "previous_wifi_state";
		field public static final java.lang.String EXTRA_RESULTS_UPDATED = "resultsUpdated";
		field public static final java.lang.String EXTRA_SUBSCRIPTION_REMEDIATION_METHOD = "android.net.wifi.extra.SUBSCRIPTION_REMEDIATION_METHOD";
		field public static final java.lang.String EXTRA_SUPPLICANT_CONNECTED = "connected";
		field public static final java.lang.String EXTRA_SUPPLICANT_ERROR = "supplicantError";
		field public static final java.lang.String EXTRA_URL = "android.net.wifi.extra.URL";
		field public static final java.lang.String EXTRA_WIFI_AP_STATE = "wifi_state";
		field public static final java.lang.String EXTRA_WIFI_CONFIGURATION = "wifiConfiguration";
		field public static final java.lang.String EXTRA_WIFI_CREDENTIAL_EVENT_TYPE = "et";

api/test-current.txt

+0 −13

Original line number	Diff line number	Diff line
		@@ -26644,7 +26644,6 @@ package android.net.wifi {
		method public boolean isTdlsSupported();
		method public boolean isWifiEnabled();
		method public deprecated boolean pingSupplicant();
		method public void queryPasspointIcon(long, java.lang.String);
		method public boolean reassociate();
		method public boolean reconnect();
		method public boolean removeNetwork(int);
		@@ -26657,29 +26656,17 @@ package android.net.wifi {
		method public boolean startScan();
		method public void startWps(android.net.wifi.WpsInfo, android.net.wifi.WifiManager.WpsCallback);
		method public int updateNetwork(android.net.wifi.WifiConfiguration);
		field public static final java.lang.String ACTION_PASSPOINT_DEAUTH_IMMINENT = "android.net.wifi.action.PASSPOINT_DEAUTH_IMMINENT";
		field public static final java.lang.String ACTION_PASSPOINT_ICON = "android.net.wifi.action.PASSPOINT_ICON";
		field public static final java.lang.String ACTION_PASSPOINT_OSU_PROVIDERS_LIST = "android.net.wifi.action.PASSPOINT_OSU_PROVIDERS_LIST";
		field public static final java.lang.String ACTION_PASSPOINT_SUBSCRIPTION_REMEDIATION = "android.net.wifi.action.PASSPOINT_SUBSCRIPTION_REMEDIATION";
		field public static final java.lang.String ACTION_PICK_WIFI_NETWORK = "android.net.wifi.PICK_WIFI_NETWORK";
		field public static final java.lang.String ACTION_REQUEST_SCAN_ALWAYS_AVAILABLE = "android.net.wifi.action.REQUEST_SCAN_ALWAYS_AVAILABLE";
		field public static final int ERROR_AUTHENTICATING = 1; // 0x1
		field public static final java.lang.String EXTRA_ANQP_ELEMENT_DATA = "android.net.wifi.extra.ANQP_ELEMENT_DATA";
		field public static final java.lang.String EXTRA_BSSID = "bssid";
		field public static final java.lang.String EXTRA_BSSID_LONG = "android.net.wifi.extra.BSSID_LONG";
		field public static final java.lang.String EXTRA_DELAY = "android.net.wifi.extra.DELAY";
		field public static final java.lang.String EXTRA_ESS = "android.net.wifi.extra.ESS";
		field public static final java.lang.String EXTRA_FILENAME = "android.net.wifi.extra.FILENAME";
		field public static final java.lang.String EXTRA_ICON = "android.net.wifi.extra.ICON";
		field public static final java.lang.String EXTRA_NETWORK_INFO = "networkInfo";
		field public static final java.lang.String EXTRA_NEW_RSSI = "newRssi";
		field public static final java.lang.String EXTRA_NEW_STATE = "newState";
		field public static final java.lang.String EXTRA_PREVIOUS_WIFI_STATE = "previous_wifi_state";
		field public static final java.lang.String EXTRA_RESULTS_UPDATED = "resultsUpdated";
		field public static final java.lang.String EXTRA_SUBSCRIPTION_REMEDIATION_METHOD = "android.net.wifi.extra.SUBSCRIPTION_REMEDIATION_METHOD";
		field public static final java.lang.String EXTRA_SUPPLICANT_CONNECTED = "connected";
		field public static final java.lang.String EXTRA_SUPPLICANT_ERROR = "supplicantError";
		field public static final java.lang.String EXTRA_URL = "android.net.wifi.extra.URL";
		field public static final java.lang.String EXTRA_WIFI_INFO = "wifiInfo";
		field public static final java.lang.String EXTRA_WIFI_STATE = "wifi_state";
		field public static final java.lang.String NETWORK_IDS_CHANGED_ACTION = "android.net.wifi.NETWORK_IDS_CHANGED";

wifi/java/android/net/wifi/WifiManager.java

+25 −1

Original line number	Diff line number	Diff line
		@@ -160,6 +160,8 @@ public class WifiManager {
		*
		* <p>Note: The broadcast is only delivered to registered receivers - no manifest registered
		* components will be launched.
		*
		* @hide
		*/
		public static final String ACTION_PASSPOINT_ICON = "android.net.wifi.action.PASSPOINT_ICON";
		/**
		@@ -167,6 +169,8 @@ public class WifiManager {
		* String representation.
		*
		* Retrieve with {@link android.content.Intent#getLongExtra(String, long)}.
		*
		* @hide
		*/
		public static final String EXTRA_BSSID_LONG = "android.net.wifi.extra.BSSID_LONG";
		/**
		@@ -174,12 +178,16 @@ public class WifiManager {
		*
		* Retrieve with {@link android.content.Intent#getParcelableExtra(String)} and cast into
		* {@link android.graphics.drawable.Icon}.
		*
		* @hide
		*/
		public static final String EXTRA_ICON = "android.net.wifi.extra.ICON";
		/**
		* Name of a file.
		*
		* Retrieve with {@link android.content.Intent#getStringExtra(String)}.
		*
		* @hide
		*/
		public static final String EXTRA_FILENAME = "android.net.wifi.extra.FILENAME";

		@@ -195,6 +203,7 @@ public class WifiManager {
		* <p>Note: The broadcast is only delivered to registered receivers - no manifest registered
		* components will be launched.
		*
		* @hide
		*/
		public static final String ACTION_PASSPOINT_OSU_PROVIDERS_LIST =
		"android.net.wifi.action.PASSPOINT_OSU_PROVIDERS_LIST";
		@@ -202,6 +211,8 @@ public class WifiManager {
		* Raw binary data of an ANQP (Access Network Query Protocol) element.
		*
		* Retrieve with {@link android.content.Intent#getByteArrayExtra(String)}.
		*
		* @hide
		*/
		public static final String EXTRA_ANQP_ELEMENT_DATA =
		"android.net.wifi.extra.ANQP_ELEMENT_DATA";
		@@ -220,6 +231,7 @@ public class WifiManager {
		* <p>Note: The broadcast is only delivered to registered receivers - no manifest registered
		* components will be launched.
		*
		* @hide
		*/
		public static final String ACTION_PASSPOINT_DEAUTH_IMMINENT =
		"android.net.wifi.action.PASSPOINT_DEAUTH_IMMINENT";
		@@ -228,18 +240,24 @@ public class WifiManager {
		* {@code true} for ESS.
		*
		* Retrieve with {@link android.content.Intent#getBooleanExtra(String, boolean)}.
		*
		* @hide
		*/
		public static final String EXTRA_ESS = "android.net.wifi.extra.ESS";
		/**
		* Delay in seconds.
		*
		* Retrieve with {@link android.content.Intent#getIntExtra(String, int)}.
		*
		* @hide
		*/
		public static final String EXTRA_DELAY = "android.net.wifi.extra.DELAY";
		/**
		* String representation of an URL.
		*
		* Retrieve with {@link android.content.Intent#getStringExtra(String)}.
		*
		* @hide
		*/
		public static final String EXTRA_URL = "android.net.wifi.extra.URL";

		@@ -254,8 +272,10 @@ public class WifiManager {
		*
		* Receiver Required Permission: android.Manifest.permission.ACCESS_WIFI_STATE
		*
		** <p>Note: The broadcast is only delivered to registered receivers - no manifest registered
		* <p>Note: The broadcast is only delivered to registered receivers - no manifest registered
		* components will be launched.
		*
		* @hide
		*/
		public static final String ACTION_PASSPOINT_SUBSCRIPTION_REMEDIATION =
		"android.net.wifi.action.PASSPOINT_SUBSCRIPTION_REMEDIATION";
		@@ -265,6 +285,8 @@ public class WifiManager {
		* 1 - SOAP XML SPP
		*
		* Retrieve with {@link android.content.Intent#getIntExtra(String, int)}.
		*
		* @hide
		*/
		public static final String EXTRA_SUBSCRIPTION_REMEDIATION_METHOD =
		"android.net.wifi.extra.SUBSCRIPTION_REMEDIATION_METHOD";
		@@ -1122,6 +1144,8 @@ public class WifiManager {
		*
		* @param bssid The BSSID of the AP
		* @param fileName Name of the icon file (remote file) to query from the AP
		*
		* @hide
		*/
		public void queryPasspointIcon(long bssid, String fileName) {
		try {