summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--wifi/java/android/net/wifi/rtt/ResponderConfig.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/wifi/java/android/net/wifi/rtt/ResponderConfig.java b/wifi/java/android/net/wifi/rtt/ResponderConfig.java
index b503769d09b0..1090bfab82aa 100644
--- a/wifi/java/android/net/wifi/rtt/ResponderConfig.java
+++ b/wifi/java/android/net/wifi/rtt/ResponderConfig.java
@@ -248,7 +248,10 @@ public class ResponderConfig implements Parcelable {
* Point (AP), which can be obtained from {@link android.net.wifi.WifiManager#getScanResults()}.
*/
public static ResponderConfig fromScanResult(ScanResult scanResult) {
- byte[] macAddress = new MacAddress(scanResult.BSSID).toByteArray();
+ byte[] macAddress = null;
+ if (scanResult.BSSID != null) {
+ macAddress = MacAddress.byteAddrFromStringAddr(scanResult.BSSID);
+ }
int responderType = RESPONDER_AP;
boolean supports80211mc = scanResult.is80211mcResponder();
int channelWidth = translcateScanResultChannelWidth(scanResult.channelWidth);