| commit | 9e1ee9bb30a3e623429cb5ef19522f865a56bca0 | [log] [tgz] |
|---|---|---|
| author | Roshan Pius <rpius@google.com> | Thu Dec 03 20:38:09 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Dec 03 20:38:09 2020 +0000 |
| tree | 7a81bbf7ad0d636f642a57aef9062f66d80ff3fb | |
| parent | 3be8d4f26c6190ee6c9d8b4f26c848b1c457c1c0 [diff] | |
| parent | 3e6084c05d8cca9d8637411e8ba2a577a8ecce88 [diff] |
Merge "wifi: Prevent returning an invalid factory MAC address" am: 6119f16921 am: 3e6084c05d Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1496341 Change-Id: If67f489d54f6ce3f4c905b5bc3497adc6b986ccb
diff --git a/wifi/1.4/default/wifi_sta_iface.cpp b/wifi/1.4/default/wifi_sta_iface.cpp index 49f383a..bc6701d 100644 --- a/wifi/1.4/default/wifi_sta_iface.cpp +++ b/wifi/1.4/default/wifi_sta_iface.cpp
@@ -636,6 +636,10 @@ 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}; }