diff options
-rw-r--r-- | wifi/java/android/net/wifi/WifiStateTracker.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/wifi/java/android/net/wifi/WifiStateTracker.java b/wifi/java/android/net/wifi/WifiStateTracker.java index 9339428..abae65d 100644 --- a/wifi/java/android/net/wifi/WifiStateTracker.java +++ b/wifi/java/android/net/wifi/WifiStateTracker.java @@ -1074,7 +1074,11 @@ public class WifiStateTracker extends NetworkStateTracker { break; case EVENT_DEFERRED_RECONNECT: - String BSSID = msg.obj.toString(); + /** + * mLastBssid can be null when there is a reconnect + * request on the first BSSID we connect to + */ + String BSSID = (msg.obj != null) ? msg.obj.toString() : null; /** * If we've exceeded the maximum number of retries for reconnecting * to a given network, blacklist the BSSID to allow a connection attempt on |