Added fix for hang on exit (#37)

Author: matt2005

include/f1x/openauto/autoapp/Service/AndroidAutoEntity.hpp

@@ -18,6 +18,7 @@
 
 #pragma once
 
+#include <atomic>
 #include <boost/asio.hpp>
 #include <aasdk/Transport/ITransport.hpp>
 #include <aasdk/Channel/Control/IControlServiceChannel.hpp>
@@ -86,6 +87,8 @@ class AndroidAutoEntity: public IAndroidAutoEntity, public aasdk::channel::contr
     ServiceList serviceList_;
     IPinger::Pointer pinger_;
     IAndroidAutoEntityEventHandler* eventHandler_;
+    // Guard to avoid re-entrant quit handling and spurious error-triggered quits during shutdown
+    std::atomic<bool> stopping_{false};
 };
 
 }

src/autoapp/Service/AndroidAutoEntity.cpp

@@ -61,6 +61,8 @@ namespace f1x {
         }
 
         void AndroidAutoEntity::stop() {
+          // Mark stopping early to suppress error-triggered quits during teardown
+          stopping_.store(true, std::memory_order_relaxed);
           strand_.dispatch([this, self = this->shared_from_this()]() {
             OPENAUTO_LOG(info) << "[AndroidAutoEntity] stop()";
 
@@ -315,6 +317,10 @@ namespace f1x {
         }
 
         void AndroidAutoEntity::onChannelError(const aasdk::error::Error &e) {
+          if (stopping_.load(std::memory_order_relaxed)) {
+            OPENAUTO_LOG(info) << "[AndroidAutoEntity] onChannelError() during stopping, ignoring: " << e.what();
+            return;
+          }
           OPENAUTO_LOG(fatal) << "[AndroidAutoEntity] onChannelError(): " << e.what();
           this->triggerQuit();
         }

src/autoapp/Service/Sensor/SensorService.cpp

@@ -57,6 +57,12 @@ namespace f1x::openauto::autoapp::service::sensor {
     this->stopPolling = true;
 
     strand_.dispatch([this, self = this->shared_from_this()]() {
+      // Cancel any pending timers to stop scheduling further polling callbacks immediately
+      boost::system::error_code ec;
+      this->timer_.cancel(ec);
+      if (ec) {
+        OPENAUTO_LOG(warning) << "[SensorService] timer cancel error: " << ec.message();
+      }
       if (this->gpsEnabled_) {
         gps_stream(&this->gpsData_, WATCH_DISABLE, NULL);
         gps_close(&this->gpsData_);