diff options
| author | Quang Luong <qal@google.com> | 2023-11-22 06:00:26 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2023-11-22 06:00:26 +0000 |
| commit | 232a0d02f401877103efd243a4fe3bdb4cf6e62a (patch) | |
| tree | 3fb332723f2066081e71fdda098d0d62df103998 | |
| parent | d3a32dd65675365a2fe9e5af7d828a683c351f22 (diff) | |
| parent | 71f65e5393c4cbe2cb42374a51a06276ec85ec87 (diff) | |
| download | wifi-232a0d02f401877103efd243a4fe3bdb4cf6e62a.tar.gz | |
Merge "Fix NPE when shared connectivity service connected" into main
| -rw-r--r-- | libs/WifiTrackerLib/src/com/android/wifitrackerlib/WifiPickerTracker.java | 10 |
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 = |