diff options
| author | Ningyuan Wang <nywang@google.com> | 2017-08-14 12:58:54 -0700 |
|---|---|---|
| committer | Ningyuan Wang <nywang@google.com> | 2017-08-14 14:26:07 -0700 |
| commit | 47678c136b1f88be3d04d89aa5898e77fa1862a3 (patch) | |
| tree | a38bfc1ab09abe385fb39bd34d641dcdbb290f8a /service | |
| parent | ff14f546b406ead034c70d09381c6dadb9a0062d (diff) | |
ScanDetailCache cleanup
This renames get() to getScanResult() to provide better
consistency with names of other methods.
This also adds @NonNull annotation for a few other
methods.
Bug: 64541323
Test: compile, unit tests
Change-Id: I7e61559390dd82f59b07ebfe2ae69ee9bb5152d2
Diffstat (limited to 'service')
3 files changed, 8 insertions, 7 deletions
diff --git a/service/java/com/android/server/wifi/ScanDetailCache.java b/service/java/com/android/server/wifi/ScanDetailCache.java index 3b69a641b..abb6ad8b0 100644 --- a/service/java/com/android/server/wifi/ScanDetailCache.java +++ b/service/java/com/android/server/wifi/ScanDetailCache.java @@ -16,6 +16,7 @@ package com.android.server.wifi; +import android.annotation.NonNull; import android.net.wifi.ScanResult; import android.net.wifi.WifiConfiguration; import android.os.SystemClock; @@ -73,7 +74,7 @@ public class ScanDetailCache { * @param bssid provided BSSID * @return {@code null} if no match ScanResult is found. */ - public ScanResult get(String bssid) { + public ScanResult getScanResult(String bssid) { ScanDetail scanDetail = getScanDetail(bssid); return scanDetail == null ? null : scanDetail.getScanResult(); } @@ -84,11 +85,11 @@ public class ScanDetailCache { * @param bssid provided BSSID * @return {@code null} if no match ScanDetail is found. */ - public ScanDetail getScanDetail(String bssid) { + public ScanDetail getScanDetail(@NonNull String bssid) { return mMap.get(bssid); } - void remove(String bssid) { + void remove(@NonNull String bssid) { mMap.remove(bssid); } diff --git a/service/java/com/android/server/wifi/WifiConfigManager.java b/service/java/com/android/server/wifi/WifiConfigManager.java index 981733d97..a7dc6a720 100644 --- a/service/java/com/android/server/wifi/WifiConfigManager.java +++ b/service/java/com/android/server/wifi/WifiConfigManager.java @@ -1927,7 +1927,7 @@ public class WifiConfigManager { } // Adding a new BSSID - ScanResult result = scanDetailCache.get(scanResult.BSSID); + ScanResult result = scanDetailCache.getScanResult(scanResult.BSSID); if (result != null) { // transfer the black list status scanResult.blackListTimestamp = result.blackListTimestamp; diff --git a/service/java/com/android/server/wifi/WifiStateMachine.java b/service/java/com/android/server/wifi/WifiStateMachine.java index ce9c09432..2769629e7 100644 --- a/service/java/com/android/server/wifi/WifiStateMachine.java +++ b/service/java/com/android/server/wifi/WifiStateMachine.java @@ -4861,7 +4861,7 @@ public class WifiStateMachine extends StateMachine implements WifiNative.WifiRss return null; } - return scanDetailCache.get(BSSID); + return scanDetailCache.getScanResult(BSSID); } String getCurrentBSSID() { @@ -5419,7 +5419,7 @@ public class WifiStateMachine extends StateMachine implements WifiNative.WifiRss ScanDetailCache scanDetailCache = mWifiConfigManager.getScanDetailCacheForNetwork(config.networkId); if (scanDetailCache != null && mLastBssid != null) { - ScanResult scanResult = scanDetailCache.get(mLastBssid); + ScanResult scanResult = scanDetailCache.getScanResult(mLastBssid); if (scanResult != null) { mWifiInfo.setFrequency(scanResult.frequency); } @@ -5972,7 +5972,7 @@ public class WifiStateMachine extends StateMachine implements WifiNative.WifiRss ScanDetailCache scanDetailCache = mWifiConfigManager .getScanDetailCacheForNetwork(config.networkId); if (scanDetailCache != null) { - ScanResult scanResult = scanDetailCache.get(mLastBssid); + ScanResult scanResult = scanDetailCache.getScanResult(mLastBssid); if (scanResult != null) { mWifiInfo.setFrequency(scanResult.frequency); } |