Merge "drm: allow to build on 64bit only guest" am: 82ae7eb4b5 am: 0af76f22c6 am: 08399ec5c6 am: a558fc7570 am: 3c182e20f0
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1560105
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I34fc3ba360fa77d3644472f54dd7a4c5685bc5c3
diff --git a/wifi/1.5/default/wifi_chip.cpp b/wifi/1.5/default/wifi_chip.cpp
index fbb4a52..414d74c 100644
--- a/wifi/1.5/default/wifi_chip.cpp
+++ b/wifi/1.5/default/wifi_chip.cpp
@@ -1036,7 +1036,6 @@
WifiStatus WifiChip::removeIfaceInstanceFromBridgedApIfaceInternal(
const std::string& ifname, const std::string& ifInstanceName) {
- legacy_hal::wifi_error legacy_status;
const auto iface = findUsingName(ap_ifaces_, ifname);
if (!iface.get() || ifInstanceName.empty()) {
return createWifiStatus(WifiStatusCode::ERROR_INVALID_ARGS);
@@ -1048,13 +1047,13 @@
if (iface == ifInstanceName) {
if (!iface_util_.lock()->removeIfaceFromBridge(it.first,
iface)) {
- LOG(ERROR) << "Failed to remove interface: " << iface
- << " from " << ifname << ", error: "
- << legacyErrorToString(legacy_status);
+ LOG(ERROR)
+ << "Failed to remove interface: " << ifInstanceName
+ << " from " << ifname;
return createWifiStatus(
WifiStatusCode::ERROR_NOT_AVAILABLE);
}
- legacy_status =
+ legacy_hal::wifi_error legacy_status =
legacy_hal_.lock()->deleteVirtualInterface(iface);
if (legacy_status != legacy_hal::WIFI_SUCCESS) {
LOG(ERROR) << "Failed to del interface: " << iface