diff options
| author | Quang Luong <qal@google.com> | 2020-08-12 15:19:11 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-08-12 15:19:11 +0000 |
| commit | af09332bc6026862d679001aff0e3f38f180fe8a (patch) | |
| tree | 87a9eda789362064cd2228e4514d8590a2b6f929 /libs/WifiTrackerLib/src | |
| parent | 33c1759783752884559a7b942a7dc12027714c1c (diff) | |
| parent | 1252c1e8cd21a9b5878c2bdff1f9c1d234b74745 (diff) | |
| download | frameworks_opt_net_wifi-af09332bc6026862d679001aff0e3f38f180fe8a.tar.gz frameworks_opt_net_wifi-af09332bc6026862d679001aff0e3f38f180fe8a.tar.bz2 frameworks_opt_net_wifi-af09332bc6026862d679001aff0e3f38f180fe8a.zip | |
Merge "[WifiTrackerLib] Add null check to setOsuWifiEntry()" into rvc-qpr-dev am: 1252c1e8cd
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/wifi/+/12345271
Change-Id: I83525ea10a50cbbffadb402ededb885e437eeae4
Diffstat (limited to 'libs/WifiTrackerLib/src')
| -rw-r--r-- | libs/WifiTrackerLib/src/com/android/wifitrackerlib/PasspointWifiEntry.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libs/WifiTrackerLib/src/com/android/wifitrackerlib/PasspointWifiEntry.java b/libs/WifiTrackerLib/src/com/android/wifitrackerlib/PasspointWifiEntry.java index 71420b9ad..36c855898 100644 --- a/libs/WifiTrackerLib/src/com/android/wifitrackerlib/PasspointWifiEntry.java +++ b/libs/WifiTrackerLib/src/com/android/wifitrackerlib/PasspointWifiEntry.java @@ -620,7 +620,9 @@ public class PasspointWifiEntry extends WifiEntry implements WifiEntry.WifiEntry /** Pass a reference to a matching OsuWifiEntry for expiration handling */ void setOsuWifiEntry(OsuWifiEntry osuWifiEntry) { mOsuWifiEntry = osuWifiEntry; - mOsuWifiEntry.setListener(this); + if (mOsuWifiEntry != null) { + mOsuWifiEntry.setListener(this); + } } /** Callback for updates to the linked OsuWifiEntry */ |