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

Commit 9c4c6ad6 authored by Peter Qiu's avatar Peter Qiu
Browse files

SettingsLib: set network status for wrong password error 

Bug: 62444625
Test: Manually connect to a WPA network with a wrong password,
      verify "Check password and try again" is shown under the network name

Change-Id: Ic226f4bb9b97969ef7e369de4f7a6976a229ba77
parent 873edc6e

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

+3 −0
Original line number Diff line number Diff line
@@ -703,6 +703,9 @@ public class AccessPoint implements Comparable<AccessPoint> { 
                case WifiConfiguration.NetworkSelectionStatus.DISABLED_AUTHENTICATION_FAILURE:

                    summary.append(mContext.getString(R.string.wifi_disabled_password_failure));

                    break;

                case WifiConfiguration.NetworkSelectionStatus.DISABLED_BY_WRONG_PASSWORD:

                    summary.append(mContext.getString(R.string.wifi_check_password_try_again));

                    break;

                case WifiConfiguration.NetworkSelectionStatus.DISABLED_DHCP_FAILURE:

                case WifiConfiguration.NetworkSelectionStatus.DISABLED_DNS_FAILURE:

                    summary.append(mContext.getString(R.string.wifi_disabled_network_failure));

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

+13 −0
Original line number Diff line number Diff line
@@ -417,6 +417,19 @@ public class AccessPointTest { 
        assertThat(ap.getSummary()).isEqualTo(expectedString);

    }



    @Test

    public void testSummaryString_showsWrongPasswordLabel() {

        WifiConfiguration configuration = createWifiConfiguration();

        configuration.getNetworkSelectionStatus().setNetworkSelectionStatus(

                WifiConfiguration.NetworkSelectionStatus.NETWORK_SELECTION_PERMANENTLY_DISABLED);

        configuration.getNetworkSelectionStatus().setNetworkSelectionDisableReason(

                WifiConfiguration.NetworkSelectionStatus.DISABLED_BY_WRONG_PASSWORD);

        AccessPoint ap = new AccessPoint(mContext, configuration);



        assertThat(ap.getSummary()).isEqualTo(mContext.getString(

                R.string.wifi_check_password_try_again));

    }



    private ScoredNetwork buildScoredNetworkWithMockBadgeCurve() {

        Bundle attr1 = new Bundle();

        attr1.putParcelable(ScoredNetwork.ATTRIBUTES_KEY_BADGING_CURVE, mockBadgeCurve);