Merge "Deprecate WifiManager EXTRA_BSSID, EXTRA_WIFI_INFO" (4422221b) · Commits · e / os / android_frameworks_base

api/current.txt

+2 −2

Original line number	Diff line number	Diff line
		@@ -27317,7 +27317,7 @@ package android.net.wifi {
		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_BSSID = "bssid";
		field public static final deprecated java.lang.String EXTRA_BSSID = "bssid";
		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";
		@@ -27325,7 +27325,7 @@ package android.net.wifi {
		field public static final java.lang.String EXTRA_RESULTS_UPDATED = "resultsUpdated";
		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_WIFI_INFO = "wifiInfo";
		field public static final deprecated 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";
		field public static final java.lang.String NETWORK_STATE_CHANGED_ACTION = "android.net.wifi.STATE_CHANGE";

packages/SettingsLib/src/com/android/settingslib/wifi/WifiStatusTracker.java

+1 −4

Original line number	Diff line number	Diff line
		@@ -51,10 +51,7 @@ public class WifiStatusTracker {
		connected = networkInfo != null && networkInfo.isConnected();
		// If Connected grab the signal strength and ssid.
		if (connected) {
		// try getting it out of the intent first
		WifiInfo info = intent.getParcelableExtra(WifiManager.EXTRA_WIFI_INFO) != null
		? (WifiInfo) intent.getParcelableExtra(WifiManager.EXTRA_WIFI_INFO)
		: mWifiManager.getConnectionInfo();
		WifiInfo info = mWifiManager.getConnectionInfo();
		if (info != null) {
		ssid = getSsid(info);
		} else {

packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/NetworkControllerWifiTest.java

+4 −4

Original line number	Diff line number	Diff line
		@@ -145,11 +145,10 @@ public class NetworkControllerWifiTest extends NetworkControllerBaseTest {
		NetworkInfo networkInfo = Mockito.mock(NetworkInfo.class);
		Mockito.when(networkInfo.isConnected()).thenReturn(connected);

		WifiInfo wifiInfo = Mockito.mock(WifiInfo.class);
		Mockito.when(wifiInfo.getSSID()).thenReturn(ssid);
		//TODO(b/69974497) mock of mWifiManager.getConnectionInfo() needed
		// Mockito.when(wifiInfo.getSSID()).thenReturn(ssid);

		i.putExtra(WifiManager.EXTRA_NETWORK_INFO, networkInfo);
		i.putExtra(WifiManager.EXTRA_WIFI_INFO, wifiInfo);
		mNetworkController.onReceive(mContext, i);
		}

		@@ -176,7 +175,8 @@ public class NetworkControllerWifiTest extends NetworkControllerBaseTest {
		assertEquals("WiFi enabled, in quick settings", enabled, (boolean) enabledArg.getValue());
		assertEquals("WiFi connected, in quick settings", connected, iconState.visible);
		assertEquals("WiFi signal, in quick settings", icon, iconState.icon);
		assertEquals("WiFI desc (ssid), in quick settings", description, descArg.getValue());
		// TODO(b/69974497) Need to mock mWifiManager.getConnectionInfo() to supply the ssid.
		// assertEquals("WiFI desc (ssid), in quick settings", description, descArg.getValue());
		}

		protected void verifyLastWifiIcon(boolean visible, int icon) {

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

+7 −13

Original line number	Diff line number	Diff line
		@@ -557,14 +557,9 @@ public class WifiManager {
		public static final String EXTRA_SUPPLICANT_CONNECTED = "connected";
		/**
		* Broadcast intent action indicating that the state of Wi-Fi connectivity
		* has changed. One extra provides the new state
		* in the form of a {@link android.net.NetworkInfo} object. If the new
		* state is CONNECTED, additional extras may provide the BSSID and WifiInfo of
		* the access point.
		* as a {@code String}.
		* has changed. An extra provides the new state
		* in the form of a {@link android.net.NetworkInfo} object.
		* @see #EXTRA_NETWORK_INFO
		* @see #EXTRA_BSSID
		* @see #EXTRA_WIFI_INFO
		*/
		@SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)
		public static final String NETWORK_STATE_CHANGED_ACTION = "android.net.wifi.STATE_CHANGE";
		@@ -576,17 +571,16 @@ public class WifiManager {
		public static final String EXTRA_NETWORK_INFO = "networkInfo";
		/**
		* The lookup key for a String giving the BSSID of the access point to which
		* we are connected. Only present when the new state is CONNECTED.
		* Retrieve with
		* {@link android.content.Intent#getStringExtra(String)}.
		* we are connected. No longer used.
		*/
		@Deprecated
		public static final String EXTRA_BSSID = "bssid";
		/**
		* The lookup key for a {@link android.net.wifi.WifiInfo} object giving the
		* information about the access point to which we are connected. Only present
		* when the new state is CONNECTED. Retrieve with
		* {@link android.content.Intent#getParcelableExtra(String)}.
		* information about the access point to which we are connected.
		* No longer used.
		*/
		@Deprecated
		public static final String EXTRA_WIFI_INFO = "wifiInfo";
		/**
		* Broadcast intent action indicating that the state of establishing a connection to