diff options
| author | Quang Luong <qal@google.com> | 2020-08-12 15:02:08 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-08-12 15:02:08 +0000 |
| commit | 1252c1e8cd21a9b5878c2bdff1f9c1d234b74745 (patch) | |
| tree | f310f061beeea81cb904b496487147e7e83934b5 | |
| parent | edbf442c77ef5731138e803b56b2bb9a196f07ae (diff) | |
| parent | a9d5ac2ceaa275e23b1673dd2f9845fd319dd0a7 (diff) | |
Merge "[WifiTrackerLib] Add null check to setOsuWifiEntry()" into rvc-qpr-dev
| -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 */ |