commit 2ae455eb22d1fb6699e19c32abbdd59e43716ee4
author Emilian Peev <epeevs@codeaurora.org> Thu Apr 18 10:41:56 2013 +0300
committer Muhua Li <muhual@codeaurora.org> Mon Apr 22 15:31:04 2013 -0700
tree 8d158213e21ae6e5eaacf17a9b57b31eec573327
parent 2ead691f576f347539d474444b66b5a1b1ee2961

QCamera2: Handle thermal events in additional states

- Currently thermal events will be discarded in picture
  taking and preview stopped state. If the camera user
  does continuously press the shutter button we could
  depending on timing receive thermal events in these
  states as well.

Change-Id: Iec83b7cab4857dafe174fef26b926c3ffbc83bd9

QCamera2/HAL/QCameraStateMachine.cpp

diff --git a/QCamera2/HAL/QCameraStateMachine.cpp b/QCamera2/HAL/QCameraStateMachine.cpp
index cf828e5..a072adb 100644
--- a/QCamera2/HAL/QCameraStateMachine.cpp
+++ b/QCamera2/HAL/QCameraStateMachine.cpp
@@ -534,6 +534,12 @@
             m_parent->signalAPIResult(&result);
         }
         break;
+    case QCAMERA_SM_EVT_THERMAL_NOTIFY:
+        {
+            rc = m_parent->updateThermalLevel(
+                    *(qcamera_thermal_level_enum_t *)&payload);
+        }
+        break;
     case QCAMERA_SM_EVT_EVT_NOTIFY:
         {
             mm_camera_event_t *cam_evt = (mm_camera_event_t *)payload;
@@ -556,7 +562,6 @@
     case QCAMERA_SM_EVT_EVT_INTERNAL:
     case QCAMERA_SM_EVT_JPEG_EVT_NOTIFY:
     case QCAMERA_SM_EVT_SNAPSHOT_DONE:
-    case QCAMERA_SM_EVT_THERMAL_NOTIFY:
     default:
         ALOGE("%s: cannot handle evt(%d) in state(%d)", __func__, evt, m_state);
         break;
@@ -1590,6 +1595,11 @@
         }
         break;
     case QCAMERA_SM_EVT_THERMAL_NOTIFY:
+        {
+            rc = m_parent->updateThermalLevel(
+                    *(qcamera_thermal_level_enum_t *)&payload);
+        }
+        break;
     default:
         ALOGE("%s: cannot handle evt(%d) in state(%d)", __func__, evt, m_state);
         break;