diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2017-10-08 07:28:44 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2017-10-08 07:28:44 +0000 |
| commit | 712602fe10a7fc96839085a015f4c81d6a903021 (patch) | |
| tree | ac039364d7def99e7bbcefcec8161e907aa2c2f5 | |
| parent | 07316e8cfcd70d7b5a4ff486b6f8330ee44659e8 (diff) | |
| parent | 0a6b9c1199f91790606acc70c771548f079fa8f0 (diff) | |
| download | android_frameworks_opt_net_wifi-712602fe10a7fc96839085a015f4c81d6a903021.tar.gz android_frameworks_opt_net_wifi-712602fe10a7fc96839085a015f4c81d6a903021.tar.bz2 android_frameworks_opt_net_wifi-712602fe10a7fc96839085a015f4c81d6a903021.zip | |
Snap for 4383937 from 0a6b9c1199f91790606acc70c771548f079fa8f0 to oc-mr1-release
Change-Id: Ib79e87b17c92b0edb6168cd1760877ac4b8ffce6
| -rw-r--r-- | service/java/com/android/server/wifi/WificondControl.java | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/service/java/com/android/server/wifi/WificondControl.java b/service/java/com/android/server/wifi/WificondControl.java index 056777fd9..b6104a8cd 100644 --- a/service/java/com/android/server/wifi/WificondControl.java +++ b/service/java/com/android/server/wifi/WificondControl.java @@ -374,8 +374,13 @@ public class WificondControl { new InformationElementUtil.Capabilities(); capabilities.from(ies, result.capability); String flags = capabilities.generateCapabilitiesString(); - NetworkDetail networkDetail = - new NetworkDetail(bssid, ies, null, result.frequency); + NetworkDetail networkDetail; + try { + networkDetail = new NetworkDetail(bssid, ies, null, result.frequency); + } catch (IllegalArgumentException e) { + Log.e(TAG, "Illegal argument for scan result with bssid: " + bssid, e); + continue; + } ScanDetail scanDetail = new ScanDetail(networkDetail, wifiSsid, bssid, flags, result.signalMbm / 100, result.frequency, result.tsf, ies, null); |