resolve merge conflicts of 0bb061f863 to master

Change-Id: I0b13f3fc6edcfb2d5982ec13728753906f158c30
This commit is contained in:
Nate Jiang
2020-08-27 20:46:28 +00:00

View File

@@ -534,6 +534,9 @@ WifiNanIface::WifiNanIface(
}
void WifiNanIface::invalidate() {
if (!isValid()) {
return;
}
// send commands to HAL to actually disable and destroy interfaces
legacy_hal_.lock()->nanDisableRequest(ifname_, 0xFFFF);
legacy_hal_.lock()->nanDataInterfaceDelete(ifname_, 0xFFFE, "aware_data0");