commit 478ad5c96a6365027e966261ed3be6f1d6492f6f
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Jan 29 21:34:10 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Jan 29 21:34:10 2020 +0000
tree f53ea97fb8bae5d973a0191001855f1b307a43b2
parent 6f3ddf948e80cfd9a5e8d2dd2dd01f67b395f407
parent 4c1b6780b4fd2111a23ee47e9aab0a6ec7aa8b82

wifi(implementation): Clear wifi event callback objects while stopping am: 4c1b6780b4

Change-Id: Ibd07d9585b3048c175888296b2bef570ba14ee4b

wifi/1.3/default/wifi.cpp

diff --git a/wifi/1.3/default/wifi.cpp b/wifi/1.3/default/wifi.cpp
index 2f21819..4229d35 100644
--- a/wifi/1.3/default/wifi.cpp
+++ b/wifi/1.3/default/wifi.cpp
@@ -124,6 +124,8 @@
             }
         }
         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 @@
         }
         LOG(ERROR) << "Wifi HAL stop failed";
     }
+    // Clear the event callback objects since the HAL is now stopped.
+    event_cb_handler_.invalidate();
     return wifi_status;
 }