diff options
| author | Matt Walliser <mattwalliser@google.com> | 2023-12-04 22:36:50 +0000 |
|---|---|---|
| committer | Matt Walliser <mattwalliser@google.com> | 2023-12-04 23:47:12 +0000 |
| commit | e6dc72d3aa888af651a35e7051e35df220609d97 (patch) | |
| tree | be2248896e66054c0cd0d86df6dfd6ad6c31e5db | |
| parent | b114787398edf5b0303c940d053bd9f4a0b752e6 (diff) | |
| download | wifi-e6dc72d3aa888af651a35e7051e35df220609d97.tar.gz | |
Fix NPE in HotspotNetworkDetailsTracker
Bug: 313921771
Test: atest WifiTrackerLibTests
Change-Id: I6c62a9e086877bf3af1f14533a09bd03910faf15
| -rw-r--r-- | libs/WifiTrackerLib/src/com/android/wifitrackerlib/HotspotNetworkDetailsTracker.java | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/libs/WifiTrackerLib/src/com/android/wifitrackerlib/HotspotNetworkDetailsTracker.java b/libs/WifiTrackerLib/src/com/android/wifitrackerlib/HotspotNetworkDetailsTracker.java index 6b392954f..e223ec403 100644 --- a/libs/WifiTrackerLib/src/com/android/wifitrackerlib/HotspotNetworkDetailsTracker.java +++ b/libs/WifiTrackerLib/src/com/android/wifitrackerlib/HotspotNetworkDetailsTracker.java @@ -112,9 +112,13 @@ public class HotspotNetworkDetailsTracker extends NetworkDetailsTracker { @Override protected void handleServiceConnected() { if (mInjector.isSharedConnectivityFeatureEnabled() && mSharedConnectivityManager != null) { - mHotspotNetworkData = mSharedConnectivityManager.getHotspotNetworks().stream().filter( - network -> network.getDeviceId() == mChosenEntry.getHotspotNetworkEntryKey() - .getDeviceId()).findFirst().orElse(null); + List<HotspotNetwork> hotspotNetworks = mSharedConnectivityManager.getHotspotNetworks(); + if (hotspotNetworks != null) { + mHotspotNetworkData = hotspotNetworks.stream().filter( + network -> network.getDeviceId() + == mChosenEntry.getHotspotNetworkEntryKey().getDeviceId()) + .findFirst().orElse(null); + } } if (mHotspotNetworkData == null) { throw new IllegalArgumentException( |