summaryrefslogtreecommitdiffstats
path: root/wifi/java/android
diff options
context:
space:
mode:
authorIrfan Sheriff <isheriff@google.com>2010-03-18 14:29:59 -0700
committerIrfan Sheriff <isheriff@google.com>2010-03-18 16:08:55 -0700
commit4f31a00376fa0907ab167af51525455ef4b4e638 (patch)
treea6654f62952eca6415babc6a4f1c73e00112fbe8 /wifi/java/android
parentb127bf2e9cd68c4d54fdcce2326293e3013c19af (diff)
downloadframeworks_base-4f31a00376fa0907ab167af51525455ef4b4e638.zip
frameworks_base-4f31a00376fa0907ab167af51525455ef4b4e638.tar.gz
frameworks_base-4f31a00376fa0907ab167af51525455ef4b4e638.tar.bz2
Fix null pointer exception
Bug: 2525763 Change-Id: If2f334187af26e0352d754d7e00a9ca3efc5dffa
Diffstat (limited to 'wifi/java/android')
-rw-r--r--wifi/java/android/net/wifi/WifiStateTracker.java6
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