commit b1ef292b3d0c2b4b4c77bb7b442df8e73d1fbb5e
author Isaac Levy <ilevy@google.com> Mon Jun 27 10:02:50 2011 -0700
committer Isaac Levy <ilevy@google.com> Mon Jun 27 15:36:21 2011 -0700
tree 4b726a6e510ad37cd6e6ca3fa92d8164725b0030
parent d7e695876ae389c43e0f8b362821e9ed051176be

Fixing null pointer b/4962091

Fixing watchdog service bug, adding some extra dump logs.

Change-Id: I03d94a46fade6974f21931803f87fdd065750612

services/java/com/android/server/WifiWatchdogService.java

diff --git a/services/java/com/android/server/WifiWatchdogService.java b/services/java/com/android/server/WifiWatchdogService.java
index 0b79478..3ba9c14 100644
--- a/services/java/com/android/server/WifiWatchdogService.java
+++ b/services/java/com/android/server/WifiWatchdogService.java
@@ -22,6 +22,7 @@
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.database.ContentObserver;
+import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
 import android.net.Uri;
 import android.net.wifi.ScanResult;
@@ -162,7 +163,8 @@
         mContext = context;
         mContentResolver = context.getContentResolver();
         mWifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
-        mDnsPinger = new DnsPinger("WifiWatchdogServer.DnsPinger", context);
+        mDnsPinger = new DnsPinger("WifiWatchdogServer.DnsPinger", context,
+                ConnectivityManager.TYPE_WIFI);
 
         HandlerThread handlerThread = new HandlerThread("WifiWatchdogServiceThread");
         handlerThread.start();
@@ -523,7 +525,7 @@
 
         if (DBG) {
             mDNSCheckLogStr = String.format("Dns Check %d.  Pinging %s on ssid [%s]: ",
-                    mStatus.numFullDNSchecks, mDnsPinger.getDns().getHostAddress(),
+                    mStatus.numFullDNSchecks, mDnsPinger.getDns(),
                     mStatus.ssid);
         }
     }
@@ -717,11 +719,13 @@
         pw.print("State " + mStatus.state);
         pw.println(", network [" + mStatus.ssid + ", " + mStatus.bssid + "]");
         pw.print("checkCount " + mStatus.numFullDNSchecks);
-        pw.print(", bssids: " + mStatus.allBssids.size());
+        pw.println(", bssids: " + mStatus.allBssids);
         pw.print(", hasCheckMessages? " +
                 mHandler.hasMessages(WifiWatchdogHandler.CHECK_SEQUENCE_STEP));
         pw.println(" hasSingleCheckMessages? " +
                 mHandler.hasMessages(WifiWatchdogHandler.SINGLE_DNS_CHECK));
+        pw.println("DNS check log str: " + mDNSCheckLogStr);
+        pw.println("lastSingleCheck: " + mStatus.lastSingleCheckTime);
     }
 
     /**