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(