From 4f31a00376fa0907ab167af51525455ef4b4e638 Mon Sep 17 00:00:00 2001 From: Irfan Sheriff Date: Thu, 18 Mar 2010 14:29:59 -0700 Subject: [PATCH] Fix null pointer exception Bug: 2525763 Change-Id: If2f334187af26e0352d754d7e00a9ca3efc5dffa --- wifi/java/android/net/wifi/WifiStateTracker.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/wifi/java/android/net/wifi/WifiStateTracker.java b/wifi/java/android/net/wifi/WifiStateTracker.java index 93394281d1638..abae65dc08386 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