commit 6a37a04653d006af953a4870637182e8dbc6cb1d
author Roshan Pius <rpius@google.com> Wed Mar 15 01:23:16 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Mar 15 01:23:16 2017 +0000
tree 23f04075f9b18315fd0532b4fcebb264179bfc40
parent add0d3c8b8ada19320b5f385c143664ee64228ab
parent bdbc4162e34d270b09c7bfd5e6639fd2d8d6117c

Merge "wifi(implementation): Make a boolean flag atomic" am: 5bdf7a0ef7
am: bdbc4162e3

Change-Id: Ifafb945391cf9cec56e9ed5ed884dd74db6f6f84

wifi/1.0/default/wifi_legacy_hal.h

diff --git a/wifi/1.0/default/wifi_legacy_hal.h b/wifi/1.0/default/wifi_legacy_hal.h
index f79e62a..576dfe6 100644
--- a/wifi/1.0/default/wifi_legacy_hal.h
+++ b/wifi/1.0/default/wifi_legacy_hal.h
@@ -289,7 +289,7 @@
   // Opaque handle to be used for all wlan0 interface specific operations.
   wifi_interface_handle wlan_interface_handle_;
   // Flag to indicate if we have initiated the cleanup of legacy HAL.
-  bool awaiting_event_loop_termination_;
+  std::atomic<bool> awaiting_event_loop_termination_;
   // Flag to indicate if the legacy HAL has been started.
   bool is_started_;
   wifi_system::InterfaceTool iface_tool_;