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

Commit d38708c1 authored by Glen Kuhne's avatar Glen Kuhne
Browse files

Don't set AccessPoint with WifiInfo.INVALID_RSSI 

This stops the RSSI of an AccessPoint object being updated from WifiInfo
for the current network, when that WifiInfo does not have a valid RSSI.
This occurs when attempting to connect to a network, and the connection
has not yet been established.
Fixes a UI bug where the signal strength would appear to be zero when
attempting to connect to something, or after failing to.

Bug: 63487286
Test: runtest --path
frameworks/base/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/AccessPointTest.java
Test: Manual. Attempt to connect to network with bad PSK. Observe Signal
strength does not get set to zero.

Change-Id: Ia5343fb6f0935134e6a4f82034de164342fe55d4
parent 40f47253

packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java

+1 −1
Original line number Diff line number Diff line
@@ -1065,7 +1065,7 @@ public class AccessPoint implements Comparable<AccessPoint> { 
                // are still seen, we will investigate further.

                update(config); // Notifies the AccessPointListener of the change

            }

            if (mRssi != info.getRssi()) {

            if (mRssi != info.getRssi() && info.getRssi() != WifiInfo.INVALID_RSSI) {

                mRssi = info.getRssi();

                updated = true;

            } else if (mNetworkInfo != null && networkInfo != null

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

+51 −0
Original line number Diff line number Diff line
@@ -625,6 +625,57 @@ public class AccessPointTest { 
        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

    public void testUpdateWithConfigChangeOnly_returnsFalseButInvokesListener() {

        int networkId = 123;