summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Eric Schwarzenbach <easchwar@google.com> 2017-08-16 11:06:40 -0700
committer Eric Schwarzenbach <easchwar@google.com> 2017-08-16 11:17:32 -0700
commit7dfc73f7c9a3cef9c987cef8eed8766cf62a8bdc (patch)
tree2df3fef723d9c657f6b20a0df8cb7f970af584de
parent6fc20cbffb9c9cdcbfdf013c9c4f52bff2037609 (diff)
Remove mSeen from AccessPoint.
Clean up unused variable and associated methods. Bug: 64533622 Test: runtest --path frameworks/base/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/AccessPointTest.java Change-Id: Ic7e2e0e606647aed95a6fb483f7c818c81e3bf3f
-rw-r--r--packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java20
1 files changed, 0 insertions, 20 deletions
diff --git a/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java b/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java
index 6b7e1776050a..e54746a41b0a 100644
--- a/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java
+++ b/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java
@@ -188,7 +188,6 @@ public class AccessPoint implements Comparable<AccessPoint> {
private WifiConfiguration mConfig;
private int mRssi = UNREACHABLE_RSSI;
- private long mSeen = 0;
private WifiInfo mInfo;
private NetworkInfo mNetworkInfo;
@@ -272,7 +271,6 @@ public class AccessPoint implements Comparable<AccessPoint> {
// Do not evict old scan results on initial creation
updateRssi();
- updateSeen();
mId = sLastId.incrementAndGet();
}
@@ -318,7 +316,6 @@ public class AccessPoint implements Comparable<AccessPoint> {
this.pskType = that.pskType;
this.mConfig = that.mConfig; //TODO: Watch out, this object is mutated.
this.mRssi = that.mRssi;
- this.mSeen = that.mSeen;
this.mInfo = that.mInfo;
this.mNetworkInfo = that.mNetworkInfo;
this.mScanResultCache.clear();
@@ -635,21 +632,6 @@ public class AccessPoint implements Comparable<AccessPoint> {
}
}
- /** Updates {@link #mSeen} based on the scan result cache. */
- private void updateSeen() {
- long seen = 0;
- for (ScanResult result : mScanResultCache.values()) {
- if (result.timestamp > seen) {
- seen = result.timestamp;
- }
- }
-
- // Only replace the previous value if we have a recent scan result to use
- if (seen != 0) {
- mSeen = seen;
- }
- }
-
/**
* Returns if the network should be considered metered.
*/
@@ -1110,7 +1092,6 @@ public class AccessPoint implements Comparable<AccessPoint> {
mScanResultCache.put(result.BSSID, result);
updateRssi();
- mSeen = result.timestamp; // even if the timestamp is old it is still valid
mIsCarrierAp = result.isCarrierAp;
mCarrierApEapType = result.carrierApEapType;
mCarrierName = result.carrierName;
@@ -1162,7 +1143,6 @@ public class AccessPoint implements Comparable<AccessPoint> {
/* Add or update the scan result for the BSSID */
mScanResultCache.put(result.BSSID, result);
if (evictOldScanResults) evictOldScanResults();
- updateSeen();
updateRssi();
int newLevel = getLevel();