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

Merge "[SB Refactor] Add null checks around network capabilities." into udc-dev

Browse Source
This commit is contained in:
Caitlin Shkuratov
2023-05-05 20:41:42 +00:00
committed by Android (Google) Code Review
parent e7f2e5bc56 a0052e490e
commit 5be99642cb
2 changed files with 27 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
packages/SettingsLib/src/com/android/settingslib/wifi/WifiStatusTracker.java
View File

@@ -343,7 +343,12 @@ public class WifiStatusTracker {
} }
@Nullable @Nullable
private WifiInfo getMainOrUnderlyingWifiInfo(NetworkCapabilities networkCapabilities) { private WifiInfo getMainOrUnderlyingWifiInfo(
@Nullable NetworkCapabilities networkCapabilities) {
if (networkCapabilities == null) {
return null;
}
WifiInfo mainWifiInfo = getMainWifiInfo(networkCapabilities); WifiInfo mainWifiInfo = getMainWifiInfo(networkCapabilities);
if (mainWifiInfo != null) { if (mainWifiInfo != null) {
return mainWifiInfo; return mainWifiInfo;
@@ -376,7 +381,10 @@ public class WifiStatusTracker {
} }
@Nullable @Nullable
private WifiInfo getMainWifiInfo(NetworkCapabilities networkCapabilities) { private WifiInfo getMainWifiInfo(@Nullable NetworkCapabilities networkCapabilities) {
if (networkCapabilities == null) {
return null;
}
boolean canHaveWifiInfo = networkCapabilities.hasTransport(TRANSPORT_WIFI) boolean canHaveWifiInfo = networkCapabilities.hasTransport(TRANSPORT_WIFI)
|| networkCapabilities.hasTransport(TRANSPORT_CELLULAR); || networkCapabilities.hasTransport(TRANSPORT_CELLULAR);
if (!canHaveWifiInfo) { if (!canHaveWifiInfo) {
@@ -402,7 +410,11 @@ public class WifiStatusTracker {
getMainOrUnderlyingWifiInfo(networkCapabilities)); getMainOrUnderlyingWifiInfo(networkCapabilities));
} }
private boolean connectionIsWifi(NetworkCapabilities networkCapabilities, WifiInfo wifiInfo) { private boolean connectionIsWifi(
@Nullable NetworkCapabilities networkCapabilities, WifiInfo wifiInfo) {
if (networkCapabilities == null) {
return false;
}
return wifiInfo != null || networkCapabilities.hasTransport(TRANSPORT_WIFI); return wifiInfo != null || networkCapabilities.hasTransport(TRANSPORT_WIFI);
} }

12
packages/SettingsLib/tests/robotests/src/com/android/settingslib/wifi/WifiStatusTrackerTest.java
View File

@@ -305,4 +305,16 @@ public class WifiStatusTrackerTest {
assertThat(mWifiStatusTracker.isDefaultNetwork).isTrue(); assertThat(mWifiStatusTracker.isDefaultNetwork).isTrue();
} }
/** Regression test for b/280169520. */
@Test
public void networkCallbackNullCapabilities_noCrash() {
Network primaryNetwork = Mockito.mock(Network.class);
// WHEN the network capabilities are null
mNetworkCallbackCaptor.getValue().onCapabilitiesChanged(
primaryNetwork, /* networkCapabilities= */ null);
// THEN there's no crash (no assert needed)
}
} }