Skip to content

Commit 04787d8

Browse files
cnchenRafiester
authored andcommitted
Fix NPE on getTitle()
Bug: 199922685 Test: make RunSettingsLibRoboTests -j40 Change-Id: I35bf6f5911dc0ee56e43af7faddaceb479362863 (cherry picked from commit f00f220) Merged-In: I35bf6f5911dc0ee56e43af7faddaceb479362863 (cherry picked from commit c006ad9)
1 parent e228a22 commit 04787d8

2 files changed

Lines changed: 17 additions & 4 deletions

File tree

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1117,14 +1117,16 @@ public String getSavedNetworkSummary() {
11171117
* Returns the display title for the AccessPoint, such as for an AccessPointPreference's title.
11181118
*/
11191119
public String getTitle() {
1120-
if (isPasspoint()) {
1120+
if (isPasspoint() && !TextUtils.isEmpty(mConfig.providerFriendlyName)) {
11211121
return mConfig.providerFriendlyName;
1122-
} else if (isPasspointConfig()) {
1122+
} else if (isPasspointConfig() && !TextUtils.isEmpty(mProviderFriendlyName)) {
11231123
return mProviderFriendlyName;
1124-
} else if (isOsuProvider()) {
1124+
} else if (isOsuProvider() && !TextUtils.isEmpty(mOsuProvider.getFriendlyName())) {
11251125
return mOsuProvider.getFriendlyName();
1126-
} else {
1126+
} else if (!TextUtils.isEmpty(getSsidStr())) {
11271127
return getSsidStr();
1128+
} else {
1129+
return "";
11281130
}
11291131
}
11301132

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

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,17 @@ public void testSsidIsSpannableString_returnFalse() {
147147
assertThat(ssid instanceof SpannableString).isFalse();
148148
}
149149

150+
@Test
151+
public void testCompareTo_GivesNull() {
152+
WifiConfiguration spyConfig = spy(new WifiConfiguration());
153+
154+
when(spyConfig.isPasspoint()).thenReturn(true);
155+
spyConfig.providerFriendlyName = null;
156+
AccessPoint passpointAp = new AccessPoint(mContext, spyConfig);
157+
158+
assertThat(passpointAp.getTitle()).isEqualTo("");
159+
}
160+
150161
@Test
151162
public void testCompareTo_GivesActiveBeforeInactive() {
152163
AccessPoint activeAp = new TestAccessPointBuilder(mContext).setActive(true).build();

0 commit comments

Comments
 (0)