Merge 07aa1ea1e87c7395bb37b8d441b2e4617183c3ef on remote branch

Change-Id: Ia11e396dc6476c5245a50f90eccd392c02d250d2
diff --git a/SoundTriggerSession.cpp b/SoundTriggerSession.cpp
index 3b09ec8..2dfa978 100644
--- a/SoundTriggerSession.cpp
+++ b/SoundTriggerSession.cpp
@@ -231,7 +231,10 @@
     session->ses_mutex_.unlock();
     lock_status = false;
     ATRACE_BEGIN("sthal: client detection callback");
-    callback(st_event, session->GetCookie());
+    if (session->state_ == ACTIVE)
+        callback(st_event, session->GetCookie());
+    else
+        ALOGW("%s: skip detection callback as client has stopped", __func__);
     ATRACE_END();
 
 exit: