PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "WiFi: Replace -1 with LINK_SPEED_UNKNOWN constant"

Browse Source
This commit is contained in:
Sunil Ravi
2019-02-27 21:16:25 +00:00
committed by Android (Google) Code Review
parent 11d1256fcc 7d0d684339
commit c430c09421
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/wifi/WifiConfigController.java
View File

@@ -376,12 +376,12 @@ public class WifiConfigController implements TextWatcher,
} }
WifiInfo info = mAccessPoint.getInfo(); WifiInfo info = mAccessPoint.getInfo();
if (info != null && info.getTxLinkSpeedMbps() != -1) { if (info != null && info.getTxLinkSpeedMbps() != WifiInfo.LINK_SPEED_UNKNOWN) {
addRow(group, R.string.tx_wifi_speed, String.format( addRow(group, R.string.tx_wifi_speed, String.format(
res.getString(R.string.tx_link_speed), info.getTxLinkSpeedMbps())); res.getString(R.string.tx_link_speed), info.getTxLinkSpeedMbps()));
} }
if (info != null && info.getRxLinkSpeedMbps() != -1) { if (info != null && info.getRxLinkSpeedMbps() != WifiInfo.LINK_SPEED_UNKNOWN) {
addRow(group, R.string.rx_wifi_speed, String.format( addRow(group, R.string.rx_wifi_speed, String.format(
res.getString(R.string.rx_link_speed), info.getRxLinkSpeedMbps())); res.getString(R.string.rx_link_speed), info.getRxLinkSpeedMbps()));
} }

4
tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java
View File

@@ -429,7 +429,7 @@ public class WifiDetailPreferenceControllerTest {
@Test @Test
public void linkSpeedPref_shouldNotShowIfNotSet() { public void linkSpeedPref_shouldNotShowIfNotSet() {
when(mockWifiInfo.getTxLinkSpeedMbps()).thenReturn(-1); when(mockWifiInfo.getTxLinkSpeedMbps()).thenReturn(WifiInfo.LINK_SPEED_UNKNOWN);
displayAndResume(); displayAndResume();
@@ -447,7 +447,7 @@ public class WifiDetailPreferenceControllerTest {
@Test @Test
public void rxLinkSpeedPref_shouldNotShowIfNotSet() { public void rxLinkSpeedPref_shouldNotShowIfNotSet() {
when(mockWifiInfo.getRxLinkSpeedMbps()).thenReturn(-1); when(mockWifiInfo.getRxLinkSpeedMbps()).thenReturn(WifiInfo.LINK_SPEED_UNKNOWN);
displayAndResume(); displayAndResume();