diff options
| author | Roshan Pius <rpius@google.com> | 2016-10-17 20:57:46 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-10-17 20:57:46 +0000 |
| commit | 2d62e700a5fc188699e1133932308e2ef6757aec (patch) | |
| tree | 306963e1f5c62fceea1d048e79207fe7b05be75e /service | |
| parent | faaf6ba27cf55bf6429b635380ce0ffea8128ace (diff) | |
| parent | c301f93e031e6a2c470524f98045fad771545a7e (diff) | |
NetworkSelector: Remove redundant network lookup
am: c301f93e03
Change-Id: I27e511c7e13d6546859671afbd67e0dd1e88a9c7
Diffstat (limited to 'service')
| -rw-r--r-- | service/java/com/android/server/wifi/SavedNetworkEvaluator.java | 5 | ||||
| -rw-r--r-- | service/java/com/android/server/wifi/WifiConfigManager.java | 6 |
2 files changed, 6 insertions, 5 deletions
diff --git a/service/java/com/android/server/wifi/SavedNetworkEvaluator.java b/service/java/com/android/server/wifi/SavedNetworkEvaluator.java index afd9b583c..a61fc1739 100644 --- a/service/java/com/android/server/wifi/SavedNetworkEvaluator.java +++ b/service/java/com/android/server/wifi/SavedNetworkEvaluator.java @@ -159,9 +159,8 @@ public class SavedNetworkEvaluator implements WifiNetworkSelector.NetworkEvaluat // Last user selection award. int lastUserSelectedNetworkId = mWifiConfigManager.getLastSelectedNetwork(); - WifiConfiguration lastUserSelectedNetwork = - mWifiConfigManager.getConfiguredNetwork(lastUserSelectedNetworkId); - if (lastUserSelectedNetwork != null && lastUserSelectedNetworkId == network.networkId) { + if (lastUserSelectedNetworkId != WifiConfiguration.INVALID_NETWORK_ID + && lastUserSelectedNetworkId == network.networkId) { long timeDifference = mClock.getElapsedSinceBootMillis() - mWifiConfigManager.getLastSelectedTimeStamp(); if (timeDifference > 0) { diff --git a/service/java/com/android/server/wifi/WifiConfigManager.java b/service/java/com/android/server/wifi/WifiConfigManager.java index 17b5b811a..7fe084dca 100644 --- a/service/java/com/android/server/wifi/WifiConfigManager.java +++ b/service/java/com/android/server/wifi/WifiConfigManager.java @@ -1782,8 +1782,10 @@ public class WifiConfigManager { } for (WifiConfiguration config : getInternalConfiguredNetworks()) { if (ScanResultUtil.doesScanResultMatchWithNetwork(scanResult, config)) { - localLog("getSavedNetworkFromScanDetail: Found " + config.configKey() - + " for " + scanResult.SSID + "[" + scanResult.capabilities + "]"); + if (mVerboseLoggingEnabled) { + Log.v(TAG, "getSavedNetworkFromScanDetail Found " + config.configKey() + + " for " + scanResult.SSID + "[" + scanResult.capabilities + "]"); + } return config; } } |