summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libs/WifiTrackerLib/src/com/android/wifitrackerlib/WifiPickerTracker.java10
1 files changed, 8 insertions, 2 deletions
diff --git a/libs/WifiTrackerLib/src/com/android/wifitrackerlib/WifiPickerTracker.java b/libs/WifiTrackerLib/src/com/android/wifitrackerlib/WifiPickerTracker.java
index c6de060a7..d36c62594 100644
--- a/libs/WifiTrackerLib/src/com/android/wifitrackerlib/WifiPickerTracker.java
+++ b/libs/WifiTrackerLib/src/com/android/wifitrackerlib/WifiPickerTracker.java
@@ -507,9 +507,15 @@ public class WifiPickerTracker extends BaseWifiTracker {
protected void handleServiceConnected() {
if (mInjector.isSharedConnectivityFeatureEnabled()) {
mKnownNetworkDataCache.clear();
- mKnownNetworkDataCache.addAll(mSharedConnectivityManager.getKnownNetworks());
+ List<KnownNetwork> knownNetworks = mSharedConnectivityManager.getKnownNetworks();
+ if (knownNetworks != null) {
+ mKnownNetworkDataCache.addAll(knownNetworks);
+ }
mHotspotNetworkDataCache.clear();
- mHotspotNetworkDataCache.addAll(mSharedConnectivityManager.getHotspotNetworks());
+ List<HotspotNetwork> hotspotNetworks = mSharedConnectivityManager.getHotspotNetworks();
+ if (hotspotNetworks != null) {
+ mHotspotNetworkDataCache.addAll(hotspotNetworks);
+ }
updateKnownNetworkEntryScans(mScanResultUpdater.getScanResults());
updateHotspotNetworkEntries();
HotspotNetworkConnectionStatus status =