diff --git a/src/com/android/settings/wifi/WifiSetupActivity.java b/src/com/android/settings/wifi/WifiSetupActivity.java
index 5452a033b29..a87c733913e 100644
--- a/src/com/android/settings/wifi/WifiSetupActivity.java
+++ b/src/com/android/settings/wifi/WifiSetupActivity.java
@@ -87,9 +87,10 @@ public class WifiSetupActivity extends WifiPickerActivity
     private final BroadcastReceiver mReceiver = new BroadcastReceiver() {
         @Override
         public void onReceive(Context context, Intent intent) {
-            NetworkInfo info = (NetworkInfo) intent.getParcelableExtra(
-                    WifiManager.EXTRA_NETWORK_INFO);
-            refreshConnectionState(info.isConnected());
+            // Refresh the connection state with the latest connection info. Use the connection info
+            // from ConnectivityManager instead of the one attached in the intent to make sure
+            // we have the most up-to-date connection state. b/17511772
+            refreshConnectionState();
         }
     };