Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c430c094 authored by Sunil Ravi's avatar Sunil Ravi Committed by Android (Google) Code Review
Browse files

Merge "WiFi: Replace -1 with LINK_SPEED_UNKNOWN constant"

parents 11d1256f 7d0d6843

src/com/android/settings/wifi/WifiConfigController.java

+2 −2
Original line number Diff line number Diff line
@@ -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()));

                    }

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

+2 −2
Original line number Diff line number Diff line
@@ -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();