From fe43d359ef35115e8fe879d51e9cc93d37a65ca1 Mon Sep 17 00:00:00 2001
From: Etan Cohen <etancohen@google.com>
Date: Mon, 4 Dec 2017 10:22:58 -0800
Subject: [PATCH] [RTT2] Fix build failure with new MacAddress

Responder was using the new MacAddress before its finalization.
Fix reference to a (now removed) constructor.

Bug: 65014962
Test: unit tests & integration tests
Change-Id: I4d0fd32454c1362129e03deada2d6e6a253e2590
---
 wifi/java/android/net/wifi/rtt/ResponderConfig.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/wifi/java/android/net/wifi/rtt/ResponderConfig.java b/wifi/java/android/net/wifi/rtt/ResponderConfig.java
index b503769d09b06..1090bfab82aad 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);