Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Don't set AccessPoint with WifiInfo.INVALID_RSSI" into oc-dr1-dev

Browse Source 
am: 860f185c66

Change-Id: Ie89e7361d90accde957dc6490dc483c4d4885c0e
This commit is contained in:
Glen Kuhne
2017-07-21 02:37:55 +00:00
committed by android-build-merger
parent 34df6c0af3 860f185c66
commit ed005b2928
2 changed files with 52 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java
View File

@@ -1065,7 +1065,7 @@ public class AccessPoint implements Comparable<AccessPoint> {
// are still seen, we will investigate further. // are still seen, we will investigate further.
update(config); // Notifies the AccessPointListener of the change update(config); // Notifies the AccessPointListener of the change
} }
if (mRssi != info.getRssi()) { if (mRssi != info.getRssi() && info.getRssi() != WifiInfo.INVALID_RSSI) {
mRssi = info.getRssi(); mRssi = info.getRssi();
updated = true; updated = true;
} else if (mNetworkInfo != null && networkInfo != null } else if (mNetworkInfo != null && networkInfo != null

51
packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/AccessPointTest.java
View File

@@ -625,6 +625,57 @@ public class AccessPointTest {
assertThat(ap.update(config, wifiInfo, newInfo)).isFalse(); assertThat(ap.update(config, wifiInfo, newInfo)).isFalse();
} }
@Test
public void testUpdateWithDifferentRssi_returnsTrue() {
int networkId = 123;
int rssi = -55;
WifiConfiguration config = new WifiConfiguration();
config.networkId = networkId;
WifiInfo wifiInfo = new WifiInfo();
wifiInfo.setNetworkId(networkId);
wifiInfo.setRssi(rssi);
NetworkInfo networkInfo =
new NetworkInfo(ConnectivityManager.TYPE_WIFI, 0 /* subtype */, "WIFI", "");
networkInfo.setDetailedState(NetworkInfo.DetailedState.CONNECTING, "", "");
AccessPoint ap = new TestAccessPointBuilder(mContext)
.setNetworkInfo(networkInfo)
.setNetworkId(networkId)
.setRssi(rssi)
.setWifiInfo(wifiInfo)
.build();
NetworkInfo newInfo = new NetworkInfo(networkInfo); // same values
wifiInfo.setRssi(rssi + 1);
assertThat(ap.update(config, wifiInfo, newInfo)).isTrue();
}
@Test
public void testUpdateWithInvalidRssi_returnsFalse() {
int networkId = 123;
int rssi = -55;
WifiConfiguration config = new WifiConfiguration();
config.networkId = networkId;
WifiInfo wifiInfo = new WifiInfo();
wifiInfo.setNetworkId(networkId);
wifiInfo.setRssi(rssi);
NetworkInfo networkInfo =
new NetworkInfo(ConnectivityManager.TYPE_WIFI, 0 /* subtype */, "WIFI", "");
networkInfo.setDetailedState(NetworkInfo.DetailedState.CONNECTING, "", "");
AccessPoint ap = new TestAccessPointBuilder(mContext)
.setNetworkInfo(networkInfo)
.setNetworkId(networkId)
.setRssi(rssi)
.setWifiInfo(wifiInfo)
.build();
NetworkInfo newInfo = new NetworkInfo(networkInfo); // same values
wifiInfo.setRssi(WifiInfo.INVALID_RSSI);
assertThat(ap.update(config, wifiInfo, newInfo)).isFalse();
}
@Test @Test
public void testUpdateWithConfigChangeOnly_returnsFalseButInvokesListener() { public void testUpdateWithConfigChangeOnly_returnsFalseButInvokesListener() {
int networkId = 123; int networkId = 123;