commit 33ef5038d780b4cc441eec867224824655e19095
author Eino-Ville Talvala <etalvala@google.com> Wed Oct 10 16:17:11 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Oct 10 16:17:11 2012 -0700
tree fa1e029d2d204f7d2950cae700a7365f288c47b2
parent 67dcf032a722dab62a15b919bcf717060a2cf166
parent cfee40e0d30aa2d93df2c4633e7573165f0d7337

am 907e5651: Camera2: Don\'t let unlocks happen during recording.

* commit '907e5651c18d0e25073743a49a685fe1a385939a':
  Camera2: Don't let unlocks happen during recording.

services/camera/libcameraservice/Camera2Client.cpp

diff --git a/services/camera/libcameraservice/Camera2Client.cpp b/services/camera/libcameraservice/Camera2Client.cpp
index cd9da42..0ab4e8c 100644
--- a/services/camera/libcameraservice/Camera2Client.cpp
+++ b/services/camera/libcameraservice/Camera2Client.cpp
@@ -454,9 +454,13 @@
     ALOGV("%s: Camera %d: Unlock call from pid %d; current client pid %d",
             __FUNCTION__, mCameraId, getCallingPid(), mClientPid);
 
-    // TODO: Check for uninterruptable conditions
-
     if (mClientPid == getCallingPid()) {
+        SharedParameters::Lock l(mParameters);
+        if (l.mParameters.state == Parameters::RECORD ||
+                l.mParameters.state == Parameters::VIDEO_SNAPSHOT) {
+            ALOGD("Not allowed to unlock camera during recording.");
+            return INVALID_OPERATION;
+        }
         mClientPid = 0;
         mCameraClient.clear();
         mSharedCameraClient.clear();