Snap for 6169764 from 4c1b6780b4fd2111a23ee47e9aab0a6ec7aa8b82 to qt-qpr3-release

Change-Id: I2585e26b69374d11cedadf86734404d3f29c6579

1 files changed, 4 insertions, 0 deletions

diff --git a/wifi/1.3/default/wifi.cpp b/wifi/1.3/default/wifi.cpp
index 2f21819db..4229d352d 100644
--- a/wifi/1.3/default/wifi.cpp
+++ b/wifi/1.3/default/wifi.cpp
@@ -124,6 +124,8 @@ WifiStatus Wifi::startInternal() {
             }
         }
         LOG(ERROR) << "Wifi HAL start failed";
+        // Clear the event callback objects since the HAL start failed.
+        event_cb_handler_.invalidate();
     }
     return wifi_status;
 }
@@ -158,6 +160,8 @@ WifiStatus Wifi::stopInternal(
         }
         LOG(ERROR) << "Wifi HAL stop failed";
     }
+    // Clear the event callback objects since the HAL is now stopped.
+    event_cb_handler_.invalidate();
     return wifi_status;
 }