diff options
| author | Jan Nordqvist <jannq@google.com> | 2015-07-23 16:53:51 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-23 16:53:51 +0000 |
| commit | 7278b8ad40ab62383229e458be962d28321158ed (patch) | |
| tree | 51c6a0483f2ac4576450d3e59acff8692ce3636d | |
| parent | c28e026a27212c867d0b863ec65c71b67513b429 (diff) | |
| parent | 5ef40f88bab7e645a5a9e42aeae768d3b916c02c (diff) | |
| download | wifi-7278b8ad40ab62383229e458be962d28321158ed.tar.gz | |
Merge "Added NPE guard around wpa_supplicant results." into mnc-dev
| -rw-r--r-- | service/java/com/android/server/wifi/hotspot2/SupplicantBridge.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/service/java/com/android/server/wifi/hotspot2/SupplicantBridge.java b/service/java/com/android/server/wifi/hotspot2/SupplicantBridge.java index 9d549daab..1b15529cb 100644 --- a/service/java/com/android/server/wifi/hotspot2/SupplicantBridge.java +++ b/service/java/com/android/server/wifi/hotspot2/SupplicantBridge.java @@ -86,7 +86,7 @@ public class SupplicantBridge { mRequestMap.put(scanDetail.getNetworkDetail().getBSSID(), scanDetail); } String result = mSupplicantHook.doCustomCommand(anqpGet); - if (result.startsWith("OK")) { + if (result != null && result.startsWith("OK")) { Log.d(Utils.hs2LogTag(getClass()), "ANQP initiated on " + scanDetail); } else { |