diff options
author | Mitchell Wills <mwills@google.com> | 2015-10-11 17:55:48 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-10-11 17:55:48 +0000 |
commit | 082dd48cb77c4ba0fccaa13906b32f3219184b37 (patch) | |
tree | ab4ad9b9e9ffc364fb50e09c54f463169d57e5ac | |
parent | 03e4ac9ff46f5afaf86a306fd0315d6f0e18bcd6 (diff) | |
parent | 6d88025b66d5407bf132f23a7a6cc3fd97f0632b (diff) | |
download | android_frameworks_opt_net_wifi-082dd48cb77c4ba0fccaa13906b32f3219184b37.tar.gz android_frameworks_opt_net_wifi-082dd48cb77c4ba0fccaa13906b32f3219184b37.tar.bz2 android_frameworks_opt_net_wifi-082dd48cb77c4ba0fccaa13906b32f3219184b37.zip |
am 6d88025b: Merge "Don\'t hold on to last scan results if scan is empty" into mnc-dr-dev
* commit '6d88025b66d5407bf132f23a7a6cc3fd97f0632b':
Don't hold on to last scan results if scan is empty
-rw-r--r-- | service/java/com/android/server/wifi/WifiStateMachine.java | 31 |
1 files changed, 2 insertions, 29 deletions
diff --git a/service/java/com/android/server/wifi/WifiStateMachine.java b/service/java/com/android/server/wifi/WifiStateMachine.java index abae99886..27c929bfb 100644 --- a/service/java/com/android/server/wifi/WifiStateMachine.java +++ b/service/java/com/android/server/wifi/WifiStateMachine.java @@ -3829,21 +3829,6 @@ public class WifiStateMachine extends StateMachine implements WifiNative.WifiPno mContext.sendStickyBroadcastAsUser(intent, UserHandle.ALL); } - /* - void ageOutScanResults(int age) { - synchronized(mScanResultCache) { - // Trim mScanResults, which prevent WifiStateMachine to return - // obsolete scan results to queriers - long now = System.CurrentTimeMillis(); - for (int i = 0; i < mScanResults.size(); i++) { - ScanResult result = mScanResults.get(i); - if ((result.seen > now || (now - result.seen) > age)) { - mScanResults.remove(i); - } - } - } - }*/ - private static final String IE_STR = "ie="; private static final String ID_STR = "id="; private static final String BSSID_STR = "bssid="; @@ -3855,8 +3840,6 @@ public class WifiStateMachine extends StateMachine implements WifiNative.WifiPno private static final String DELIMITER_STR = "===="; private static final String END_STR = "####"; - int emptyScanResultCount = 0; - // Used for matching BSSID strings, at least one characteer must be a non-zero number private static Pattern mNotZero = Pattern.compile("[1-9a-fA-F]"); @@ -3916,23 +3899,13 @@ public class WifiStateMachine extends StateMachine implements WifiNative.WifiPno if (sid == -1) break; } - // Age out scan results, we return all scan results found in the last 12 seconds, - // and NOT all scan results since last scan. - // ageOutScanResults(12000); - scanResults = scanResultsBuf.toString(); + if (TextUtils.isEmpty(scanResults)) { - emptyScanResultCount++; - if (emptyScanResultCount > 10) { - // If we got too many empty scan results, the current scan cache is stale, - // hence clear it. - mScanResults = new ArrayList<>(); - } + mScanResults = new ArrayList<>(); return; } - emptyScanResultCount = 0; - mWifiConfigStore.trimANQPCache(false); // note that all these splits and substrings keep references to the original |