Merge "WifiConfigManager: clean up log message level" into nyc-dev

1 files changed, 24 insertions, 24 deletions

diff --git a/service/java/com/android/server/wifi/WifiConfigManager.java b/service/java/com/android/server/wifi/WifiConfigManager.java
index 5d1f7e409..424a2318e 100644
--- a/service/java/com/android/server/wifi/WifiConfigManager.java
+++ b/service/java/com/android/server/wifi/WifiConfigManager.java
@@ -618,7 +618,7 @@ public class WifiConfigManager {
                 result.averageRssi(previousRssi, previousSeen,
                         WifiQualifiedNetworkSelector.SCAN_RESULT_MAXIMUNM_AGE);
                 if (sVDBG) {
-                    loge("updateConfiguration freq=" + result.frequency
+                    logd("updateConfiguration freq=" + result.frequency
                             + " BSSID=" + result.BSSID
                             + " RSSI=" + result.level
                             + " " + config.configKey());
@@ -731,7 +731,7 @@ public class WifiConfigManager {
                 if (result == null) {
                     loge("Could not find scan result for " + config.BSSID);
                 } else {
-                    log("Setting SSID for " + config.networkId + " to" + result.getSSID());
+                    logd("Setting SSID for " + config.networkId + " to" + result.getSSID());
                     setSSIDNative(config, result.getSSID());
                 }
 
@@ -789,7 +789,7 @@ public class WifiConfigManager {
 
         if (mDeletedEphemeralSSIDs.remove(config.SSID)) {
             if (sVDBG) {
-                loge("WifiConfigManager: removed from ephemeral blacklist: " + config.SSID);
+                logd("WifiConfigManager: removed from ephemeral blacklist: " + config.SSID);
             }
             // NOTE: This will be flushed to disk as part of the addOrUpdateNetworkNative call
             // below, since we're creating/modifying a config.
@@ -811,7 +811,7 @@ public class WifiConfigManager {
                         WifiConfiguration.NetworkSelectionStatus.NETWORK_SELECTION_ENABLE);
             }
             if (sVDBG) {
-                loge("WifiConfigManager: saveNetwork got config back netId="
+                logd("WifiConfigManager: saveNetwork got config back netId="
                         + Integer.toString(netId)
                         + " uid=" + Integer.toString(config.creatorUid));
             }
@@ -886,10 +886,10 @@ public class WifiConfigManager {
         WifiConfiguration foundConfig = mConfiguredNetworks.getEphemeralForCurrentUser(ssid);
 
         mDeletedEphemeralSSIDs.add(ssid);
-        loge("Forget ephemeral SSID " + ssid + " num=" + mDeletedEphemeralSSIDs.size());
+        logd("Forget ephemeral SSID " + ssid + " num=" + mDeletedEphemeralSSIDs.size());
 
         if (foundConfig != null) {
-            loge("Found ephemeral config in disableEphemeralNetwork: " + foundConfig.networkId);
+            logd("Found ephemeral config in disableEphemeralNetwork: " + foundConfig.networkId);
         }
 
         writeKnownNetworkHistory();
@@ -1857,7 +1857,7 @@ public class WifiConfigManager {
 
     public void setAndEnableLastSelectedConfiguration(int netId) {
         if (sVDBG) {
-            loge("setLastSelectedConfiguration " + Integer.toString(netId));
+            logd("setLastSelectedConfiguration " + Integer.toString(netId));
         }
         if (netId == WifiConfiguration.INVALID_NETWORK_ID) {
             mLastSelectedConfiguration = null;
@@ -1873,7 +1873,7 @@ public class WifiConfigManager {
                 updateNetworkSelectionStatus(netId,
                         WifiConfiguration.NetworkSelectionStatus.NETWORK_SELECTION_ENABLE);
                 if (sVDBG) {
-                    loge("setLastSelectedConfiguration now: " + mLastSelectedConfiguration);
+                    logd("setLastSelectedConfiguration now: " + mLastSelectedConfiguration);
                 }
             }
         }
@@ -1926,7 +1926,7 @@ public class WifiConfigManager {
             // This is the only place the map is looked up through a (dangerous) hash-value!
 
             if (config == null || config.ephemeral) {
-                loge("configuration found for missing network, nid=" + id
+                logd("configuration found for missing network, nid=" + id
                         + ", ignored, networks.size=" + Integer.toString(networks.size()));
             } else {
                 config.setIpConfiguration(networks.valueAt(i));
@@ -1958,7 +1958,7 @@ public class WifiConfigManager {
                 config.networkId = currentConfig.networkId;
             } else {
                 if (mMOManager.getHomeSP(config.FQDN) != null) {
-                    loge("addOrUpdateNetworkNative passpoint " + config.FQDN
+                    logd("addOrUpdateNetworkNative passpoint " + config.FQDN
                             + " was found, but no network Id");
                     existingMO = true;
                 }
@@ -2280,7 +2280,7 @@ public class WifiConfigManager {
     public void linkConfiguration(WifiConfiguration config) {
         if (!WifiConfigurationUtil.isVisibleToAnyProfile(config,
                 mUserManager.getProfiles(mCurrentUserId))) {
-            loge("linkConfiguration: Attempting to link config " + config.configKey()
+            logd("linkConfiguration: Attempting to link config " + config.configKey()
                     + " that is not visible to the current user.");
             return;
         }
@@ -2320,7 +2320,7 @@ public class WifiConfigManager {
                 // If both default GW are known, link only if they are equal
                 if (config.defaultGwMacAddress.equals(link.defaultGwMacAddress)) {
                     if (sVDBG) {
-                        loge("linkConfiguration link due to same gw " + link.SSID
+                        logd("linkConfiguration link due to same gw " + link.SSID
                                 + " and " + config.SSID + " GW " + config.defaultGwMacAddress);
                     }
                     doLink = true;
@@ -2336,7 +2336,7 @@ public class WifiConfigManager {
                     for (String abssid : getScanDetailCache(config).keySet()) {
                         for (String bbssid : linkedScanDetailCache.keySet()) {
                             if (sVVDBG) {
-                                loge("linkConfiguration try to link due to DBDC BSSID match "
+                                logd("linkConfiguration try to link due to DBDC BSSID match "
                                         + link.SSID + " and " + config.SSID + " bssida " + abssid
                                         + " bssidb " + bbssid);
                             }
@@ -2365,7 +2365,7 @@ public class WifiConfigManager {
 
             if (doLink) {
                 if (sVDBG) {
-                    loge("linkConfiguration: will link " + link.configKey()
+                    logd("linkConfiguration: will link " + link.configKey()
                             + " and " + config.configKey());
                 }
                 if (link.linkedConfigurations == null) {
@@ -2384,7 +2384,7 @@ public class WifiConfigManager {
                 if (link.linkedConfigurations != null
                         && (link.linkedConfigurations.get(config.configKey()) != null)) {
                     if (sVDBG) {
-                        loge("linkConfiguration: un-link " + config.configKey()
+                        logd("linkConfiguration: un-link " + config.configKey()
                                 + " from " + link.configKey());
                     }
                     link.linkedConfigurations.remove(config.configKey());
@@ -2392,7 +2392,7 @@ public class WifiConfigManager {
                 if (config.linkedConfigurations != null
                         && (config.linkedConfigurations.get(link.configKey()) != null)) {
                     if (sVDBG) {
-                        loge("linkConfiguration: un-link " + link.configKey()
+                        logd("linkConfiguration: un-link " + link.configKey()
                                 + " from " + config.configKey());
                     }
                     config.linkedConfigurations.remove(link.configKey());
@@ -2425,7 +2425,7 @@ public class WifiConfigManager {
             if (config.linkedConfigurations != null) {
                 dbg.append(" linked=" + config.linkedConfigurations.size());
             }
-            loge(dbg.toString());
+            logd(dbg.toString());
         }
 
         int numChannels = 0;
@@ -2438,7 +2438,7 @@ public class WifiConfigManager {
                 }
                 if (sVDBG) {
                     boolean test = (now_ms - result.seen) < age;
-                    loge("has " + result.BSSID + " freq=" + Integer.toString(result.frequency)
+                    logd("has " + result.BSSID + " freq=" + Integer.toString(result.frequency)
                             + " age=" + Long.toString(now_ms - result.seen) + " ?=" + test);
                 }
                 if (((now_ms - result.seen) < age)/*||(!restrict || result.is24GHz())*/) {
@@ -2461,7 +2461,7 @@ public class WifiConfigManager {
                 for (ScanDetail scanDetail : getScanDetailCache(linked).values()) {
                     ScanResult result = scanDetail.getScanResult();
                     if (sVDBG) {
-                        loge("has link: " + result.BSSID
+                        logd("has link: " + result.BSSID
                                 + " freq=" + Integer.toString(result.frequency)
                                 + " age=" + Long.toString(now_ms - result.seen));
                     }
@@ -2650,11 +2650,11 @@ public class WifiConfigManager {
         if (scanDetailCache.size() > (MAX_NUM_SCAN_CACHE_ENTRIES + 64)) {
             long now_dbg = 0;
             if (sVVDBG) {
-                loge(" Will trim config " + config.configKey()
+                logd(" Will trim config " + config.configKey()
                         + " size " + scanDetailCache.size());
 
                 for (ScanDetail sd : scanDetailCache.values()) {
-                    loge("     " + sd.getBSSIDString() + " " + sd.getSeen());
+                    logd("     " + sd.getBSSIDString() + " " + sd.getSeen());
                 }
                 now_dbg = SystemClock.elapsedRealtimeNanos();
             }
@@ -2664,9 +2664,9 @@ public class WifiConfigManager {
             scanDetailCache.trim(MAX_NUM_SCAN_CACHE_ENTRIES);
             if (sVVDBG) {
                 long diff = SystemClock.elapsedRealtimeNanos() - now_dbg;
-                loge(" Finished trimming config, time(ns) " + diff);
+                logd(" Finished trimming config, time(ns) " + diff);
                 for (ScanDetail sd : scanDetailCache.values()) {
-                    loge("     " + sd.getBSSIDString() + " " + sd.getSeen());
+                    logd("     " + sd.getBSSIDString() + " " + sd.getSeen());
                 }
             }
         }
@@ -2941,7 +2941,7 @@ public class WifiConfigManager {
         config.SSID = "\"" + result.SSID + "\"";
 
         if (sVDBG) {
-            loge("WifiConfiguration from scan results "
+            logd("WifiConfiguration from scan results "
                     + config.SSID + " cap " + result.capabilities);
         }