From 7d0d684339c172b05562e51ba1a3c4936b7d2a24 Mon Sep 17 00:00:00 2001 From: Sunil Ravi Date: Tue, 26 Feb 2019 11:43:03 -0800 Subject: [PATCH] WiFi: Replace -1 with LINK_SPEED_UNKNOWN constant Defined constant LINK_SPEED_UNKNOWN = -1 in WiFiInfo for unknown link speeds. So replacing -1 with this new macro. Bug: 124302657 Test: Connect STA to AP and verify the link speeds in network details. Change-Id: Ie21069984adb02420ca55b08a8cb161aaad2b7b3 --- src/com/android/settings/wifi/WifiConfigController.java | 4 ++-- .../wifi/details/WifiDetailPreferenceControllerTest.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/com/android/settings/wifi/WifiConfigController.java b/src/com/android/settings/wifi/WifiConfigController.java index 1d78485a94b..59d22de6742 100644 --- a/src/com/android/settings/wifi/WifiConfigController.java +++ b/src/com/android/settings/wifi/WifiConfigController.java @@ -376,12 +376,12 @@ public class WifiConfigController implements TextWatcher, } 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( 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( res.getString(R.string.rx_link_speed), info.getRxLinkSpeedMbps())); } diff --git a/tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java index 308d4b57cc1..3944f84072e 100644 --- a/tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java @@ -429,7 +429,7 @@ public class WifiDetailPreferenceControllerTest { @Test public void linkSpeedPref_shouldNotShowIfNotSet() { - when(mockWifiInfo.getTxLinkSpeedMbps()).thenReturn(-1); + when(mockWifiInfo.getTxLinkSpeedMbps()).thenReturn(WifiInfo.LINK_SPEED_UNKNOWN); displayAndResume(); @@ -447,7 +447,7 @@ public class WifiDetailPreferenceControllerTest { @Test public void rxLinkSpeedPref_shouldNotShowIfNotSet() { - when(mockWifiInfo.getRxLinkSpeedMbps()).thenReturn(-1); + when(mockWifiInfo.getRxLinkSpeedMbps()).thenReturn(WifiInfo.LINK_SPEED_UNKNOWN); displayAndResume();