Merge changes If83c1cbe,I12ad2665 am: cdca05557d (b005b3ae) · Commits · e / os / android_hardware_interfaces

wifi/1.0/default/wifi_legacy_hal.cpp

+2 −1

Original line number	Diff line number	Diff line
		@@ -59,6 +59,8 @@ void onAsyncStopComplete(wifi_handle handle) {
		const auto lock = hidl_sync_util::acquireGlobalLock();
		if (on_stop_complete_internal_callback) {
		on_stop_complete_internal_callback(handle);
		// Invalidate this callback since we don't want this firing again.
		on_stop_complete_internal_callback = nullptr;
		}
		}

		@@ -1261,7 +1263,6 @@ WifiLegacyHal::getGscanCachedResults() {
		void WifiLegacyHal::invalidate() {
		global_handle_ = nullptr;
		wlan_interface_handle_ = nullptr;
		on_stop_complete_internal_callback = nullptr;
		on_driver_memory_dump_internal_callback = nullptr;
		on_firmware_memory_dump_internal_callback = nullptr;
		on_gscan_event_internal_callback = nullptr;