fix logspam

Bug:18589606

Change-Id: Ieee0b91ab96ec9392a9b91ac1017a319605425dc

1 files changed, 19 insertions, 2 deletions

diff --git a/service/java/com/android/server/wifi/WifiConfigStore.java b/service/java/com/android/server/wifi/WifiConfigStore.java
index cd7cb5789..ebdf40efa 100644
--- a/service/java/com/android/server/wifi/WifiConfigStore.java
+++ b/service/java/com/android/server/wifi/WifiConfigStore.java
@@ -1800,7 +1800,7 @@ public class WifiConfigStore extends IpConfigStore {
     }
 
     public void setLastSelectedConfiguration(int netId) {
-        if (DBG) {
+        if (VDBG) {
             loge("setLastSelectedConfiguration " + Integer.toString(netId));
         }
         if (netId == WifiConfiguration.INVALID_NETWORK_ID) {
@@ -3359,11 +3359,28 @@ public class WifiConfigStore extends IpConfigStore {
                     scanResult.untrusted = true;
                 }
 
-                if (config.scanResultCache.size() > (maxNumScanCacheEntries+64)) {
+                if (config.scanResultCache.size() > (maxNumScanCacheEntries + 64)) {
+                    long now_dbg = 0;
+                    if (VVDBG) {
+                        loge(" Will trim config " + config.configKey()
+                                + " size " + config.scanResultCache.size());
+
+                        for (ScanResult r : config.scanResultCache.values()) {
+                            loge("     " + result.BSSID + " " + result.seen);
+                        }
+                        now_dbg = SystemClock.elapsedRealtimeNanos();
+                    }
                     // Trim the scan result cache to maxNumScanCacheEntries entries max
                     // Since this operation is expensive, make sure it is not performed
                     // until the cache has grown significantly above the trim treshold
                     config.trimScanResultsCache(maxNumScanCacheEntries);
+                    if (VVDBG) {
+                        long diff = SystemClock.elapsedRealtimeNanos() - now_dbg;
+                        loge(" Finished trimming config, time(ns) " + diff);
+                        for (ScanResult r : config.scanResultCache.values()) {
+                            loge("     " + r.BSSID + " " + r.seen);
+                        }
+                    }
                 }
 
                 // Add the scan result to this WifiConfiguration