Merge "st-hal: fix incorrect client session state"
diff --git a/st_session.c b/st_session.c
index 2fb506d..9b6d5c6 100644
--- a/st_session.c
+++ b/st_session.c
@@ -2646,7 +2646,12 @@
st_ses->hw_session_started = true;
} else {
ALOGE("%s:[%d] failed to restart", __func__, st_ses->sm_handle);
- st_ses->hw_session_started = false;
+ /*
+ * lower layers like gcs/lsm need to handle double stop calls properly
+ * to avoid possible crash, as some of the clean ups are already issued
+ * during fptrs->restart() when it's failed.
+ */
+ stop_hw_session(st_ses, hw_ses, true);
}
return status;
@@ -5265,6 +5270,7 @@
hw_ses->fptrs->stop_buffering(hw_ses);
if (hw_ses->sthw_cfg_updated || ev->ev_id == ST_SES_EV_START) {
status = stop_session(st_ses, hw_ses, false);
+ STATE_TRANSITION(st_ses, loaded_state_fn);
if (status) {
ALOGE("%s:[%d] failed to stop session, err %d", __func__,
st_ses->sm_handle, status);