commit 31ecd2686c8c25987a062b071378f7a78c7bfe98
author Vinit Deshpande <vinitd@google.com> Thu Apr 23 15:06:46 2015 -0700
committer Vinit Deshpande <vinitd@google.com> Mon May 11 19:29:14 2015 -0700
tree 938c63299e526de7a0fef62458adbe49f4421707
parent 00ebd8f3776aa8e6f91e9a1ab541f53f389b00b6

Fix more logspam from HAL and WifiStateMachine [DO NOT MERGE]

(cherry-picked from e73629f79c8bd59f0f0857a5101160a4d93b1190)

This change also fixes multiple HAL listening threads
and few more logs from WifiScanner

Bug: 20416721

Change-Id: I58f9940d57b27752287e594ecca394c206eb060f

service/java/com/android/server/wifi/WifiNative.java

diff --git a/service/java/com/android/server/wifi/WifiNative.java b/service/java/com/android/server/wifi/WifiNative.java
index 7eb35eb..dc60358 100644
--- a/service/java/com/android/server/wifi/WifiNative.java
+++ b/service/java/com/android/server/wifi/WifiNative.java
@@ -1212,6 +1212,8 @@
         synchronized (mLock) {
             if (sHalFailed)
                 return false;
+            if (sHalIsStarted)
+                return true;
             if (startHalNative() && (getInterfaces() != 0) && (sWlan0Index != -1)) {
                 new MonitorThread().start();
                 sHalIsStarted = true;

service/java/com/android/server/wifi/WifiScanningServiceImpl.java

diff --git a/service/java/com/android/server/wifi/WifiScanningServiceImpl.java b/service/java/com/android/server/wifi/WifiScanningServiceImpl.java
index f740c43..4b249b9 100644
--- a/service/java/com/android/server/wifi/WifiScanningServiceImpl.java
+++ b/service/java/com/android/server/wifi/WifiScanningServiceImpl.java
@@ -64,7 +64,7 @@
 public class WifiScanningServiceImpl extends IWifiScanner.Stub {
 
     private static final String TAG = "WifiScanningService";
-    private static final boolean DBG = true;
+    private static final boolean DBG = false;
     private static final boolean VDBG = false;
     
     private static final int INVALID_KEY = 0;                               // same as WifiScanner
@@ -611,8 +611,8 @@
                 sb.append("  band:").append(scanSettings.band);
                 sb.append("  period:").append(scanSettings.periodInMs);
                 sb.append("  reportEvents:").append(scanSettings.reportEvents);
-                sb.append("  numBssidsPerScan:").append(scanSettings.numBssidsPerScan).append("\n");
-                sb.append("  maxScansToCache:").append(scanSettings.maxScansToCache);
+                sb.append("  numBssidsPerScan:").append(scanSettings.numBssidsPerScan);
+                sb.append("  maxScansToCache:").append(scanSettings.maxScansToCache).append("\n");
 
                 sb.append("  channels: ");
 
@@ -714,7 +714,8 @@
                     index++;
                 }
             }
-            Log.d(TAG, "delivering results, num = " + results2.length);
+
+            if (DBG) Log.d(TAG, "delivering results, num = " + results2.length);
 
             deliverScanResults(handler, results2);
             if (settings.periodInMs == 0) {
@@ -1005,13 +1006,13 @@
                 for (ChannelSpec desiredChannelSpec : channels) {
                     mChannelToBucketMap.put(desiredChannelSpec.frequency, mostFrequentBucketIndex);
                 }
-                Log.d(TAG, "returning mf bucket number " + mostFrequentBucketIndex);
+                if (DBG) Log.d(TAG, "returning mf bucket number " + mostFrequentBucketIndex);
                 return mostFrequentBucketIndex;
             } else if (bestBucketIndex != -1) {
                 for (ChannelSpec desiredChannelSpec : channels) {
                     mChannelToBucketMap.put(desiredChannelSpec.frequency, bestBucketIndex);
                 }
-                Log.d(TAG, "returning best bucket number " + bestBucketIndex);
+                if (DBG) Log.d(TAG, "returning best bucket number " + bestBucketIndex);
                 return bestBucketIndex;
             }
 

service/jni/com_android_server_wifi_WifiNative.cpp

diff --git a/service/jni/com_android_server_wifi_WifiNative.cpp b/service/jni/com_android_server_wifi_WifiNative.cpp
index 2ff5c6e..b1b0fed 100644
--- a/service/jni/com_android_server_wifi_WifiNative.cpp
+++ b/service/jni/com_android_server_wifi_WifiNative.cpp
@@ -237,7 +237,7 @@
         return NULL;
     }
 
-    ALOGE("setting SSID to %s", result->ssid);
+    ALOGV("setting SSID to %s", result->ssid);
     //jstring jssid = env->NewStringUTF(result->ssid);
     setStringField(env, scanResult, "SSID", result->ssid);