Merge "wifi: Prevent returning an invalid factory MAC address" am: 6119f16921

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1496341

Change-Id: Ic8ad496bdee5d96f46bf3de63e1131bf84ee7581
This commit is contained in:
Roshan Pius
2020-12-03 20:05:19 +00:00
committed by Automerger Merge Worker

View File

@@ -636,6 +636,10 @@ std::pair<WifiStatus, std::array<uint8_t, 6>>
WifiStaIface::getFactoryMacAddressInternal() {
std::array<uint8_t, 6> mac =
iface_util_.lock()->getFactoryMacAddress(ifname_);
if (mac[0] == 0 && mac[1] == 0 && mac[2] == 0 && mac[3] == 0 &&
mac[4] == 0 && mac[5] == 0) {
return {createWifiStatus(WifiStatusCode::ERROR_UNKNOWN), mac};
}
return {createWifiStatus(WifiStatusCode::SUCCESS), mac};
}