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

Commit 25d1e643 authored by Quang Luong's avatar Quang Luong Committed by Automerger Merge Worker
Browse files

Merge "Fix NPE on getTitle()" into rvc-dev am: b1bf7f55 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15888884

Change-Id: I24fa6527a0b5727f5c1830d528dc86e27abf3c8b
parents 75390af4 b1bf7f55

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

+6 −4
Original line number Diff line number Diff line
@@ -1117,14 +1117,16 @@ public class AccessPoint implements Comparable<AccessPoint> { 
     * Returns the display title for the AccessPoint, such as for an AccessPointPreference's title.

     */

    public String getTitle() {

        if (isPasspoint()) {

        if (isPasspoint() && !TextUtils.isEmpty(mConfig.providerFriendlyName)) {

            return mConfig.providerFriendlyName;

        } else if (isPasspointConfig()) {

        } else if (isPasspointConfig() && !TextUtils.isEmpty(mProviderFriendlyName)) {

            return mProviderFriendlyName;

        } else if (isOsuProvider()) {

        } else if (isOsuProvider() && !TextUtils.isEmpty(mOsuProvider.getFriendlyName())) {

            return mOsuProvider.getFriendlyName();

        } else {

        } else if (!TextUtils.isEmpty(getSsidStr())) {

            return getSsidStr();

        } else {

            return "";

        }

    }

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

+11 −0
Original line number Diff line number Diff line
@@ -147,6 +147,17 @@ public class AccessPointTest { 
        assertThat(ssid instanceof SpannableString).isFalse();

    }



    @Test

    public void testCompareTo_GivesNull() {

        WifiConfiguration spyConfig = spy(new WifiConfiguration());



        when(spyConfig.isPasspoint()).thenReturn(true);

        spyConfig.providerFriendlyName = null;

        AccessPoint passpointAp = new AccessPoint(mContext, spyConfig);



        assertThat(passpointAp.getTitle()).isEqualTo("");

    }



    @Test

    public void testCompareTo_GivesActiveBeforeInactive() {

        AccessPoint activeAp = new TestAccessPointBuilder(mContext).setActive(true).build();