Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I24fa6527a0b5727f5c1830d528dc86e27abf3c8b
This commit is contained in:
Quang Luong
2021-09-30 15:24:27 +00:00
committed by Automerger Merge Worker
parent 75390af495 b1bf7f55c0
commit 25d1e643ec
2 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java
View File

@@ -1117,14 +1117,16 @@ public class AccessPoint implements Comparable<AccessPoint> {
* Returns the display title for the AccessPoint, such as for an AccessPointPreference's title. * Returns the display title for the AccessPoint, such as for an AccessPointPreference's title.
*/ */
public String getTitle() { public String getTitle() {
if (isPasspoint()) { if (isPasspoint() && !TextUtils.isEmpty(mConfig.providerFriendlyName)) {
return mConfig.providerFriendlyName; return mConfig.providerFriendlyName;
} else if (isPasspointConfig()) { } else if (isPasspointConfig() && !TextUtils.isEmpty(mProviderFriendlyName)) {
return mProviderFriendlyName; return mProviderFriendlyName;
} else if (isOsuProvider()) { } else if (isOsuProvider() && !TextUtils.isEmpty(mOsuProvider.getFriendlyName())) {
return mOsuProvider.getFriendlyName(); return mOsuProvider.getFriendlyName();
} else { } else if (!TextUtils.isEmpty(getSsidStr())) {
return getSsidStr(); return getSsidStr();
} else {
return "";
} }
} }

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

@@ -147,6 +147,17 @@ public class AccessPointTest {
assertThat(ssid instanceof SpannableString).isFalse(); 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 @Test
public void testCompareTo_GivesActiveBeforeInactive() { public void testCompareTo_GivesActiveBeforeInactive() {
AccessPoint activeAp = new TestAccessPointBuilder(mContext).setActive(true).build(); AccessPoint activeAp = new TestAccessPointBuilder(mContext).setActive(true).build();