Merge "Update wifi enabled state when connected." into pi-dev (1ee437e4) · Commits · e / os / android_frameworks_base

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

+7 −3

Original line number	Diff line number	Diff line
		@@ -103,10 +103,9 @@ public class WifiStatusTracker extends ConnectivityManager.NetworkCallback {
		public void handleBroadcast(Intent intent) {
		String action = intent.getAction();
		if (action.equals(WifiManager.WIFI_STATE_CHANGED_ACTION)) {
		state = intent.getIntExtra(WifiManager.EXTRA_WIFI_STATE,
		WifiManager.WIFI_STATE_UNKNOWN);
		enabled = state == WifiManager.WIFI_STATE_ENABLED;
		updateWifiState();
		} else if (action.equals(WifiManager.NETWORK_STATE_CHANGED_ACTION)) {
		updateWifiState();
		final NetworkInfo networkInfo =
		intent.getParcelableExtra(WifiManager.EXTRA_NETWORK_INFO);
		connected = networkInfo != null && networkInfo.isConnected();
		@@ -128,6 +127,11 @@ public class WifiStatusTracker extends ConnectivityManager.NetworkCallback {
		}
		}

		private void updateWifiState() {
		state = mWifiManager.getWifiState();
		enabled = state == WifiManager.WIFI_STATE_ENABLED;
		}

		private void updateRssi(int newRssi) {
		rssi = newRssi;
		level = WifiManager.calculateSignalLevel(rssi, WifiManager.RSSI_LEVELS);

+2 −3

Original line number	Diff line number	Diff line
		@@ -136,10 +136,9 @@ public class NetworkControllerWifiTest extends NetworkControllerBaseTest {
		}

		protected void setWifiEnabled(boolean enabled) {
		Intent i = new Intent(WifiManager.WIFI_STATE_CHANGED_ACTION);
		i.putExtra(WifiManager.EXTRA_WIFI_STATE,
		when(mMockWm.getWifiState()).thenReturn(
		enabled ? WifiManager.WIFI_STATE_ENABLED : WifiManager.WIFI_STATE_DISABLED);
		mNetworkController.onReceive(mContext, i);
		mNetworkController.onReceive(mContext, new Intent(WifiManager.WIFI_STATE_CHANGED_ACTION));
		}

		protected void setWifiState(boolean connected, String ssid) {