diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2012-10-10 17:22:53 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-10-10 17:22:53 -0700 |
| commit | 31fb725372f2f62a234c4f43c66504dddeaf3c8f (patch) | |
| tree | 0575bfe352f3b120e240de096ddef5250766ad17 /services | |
| parent | 4c510b9209f7f75520fd2d62657f08192cc49a51 (diff) | |
| parent | f52309555013e9909b248374f96d22dae29f6454 (diff) | |
| download | frameworks_av-31fb725372f2f62a234c4f43c66504dddeaf3c8f.zip frameworks_av-31fb725372f2f62a234c4f43c66504dddeaf3c8f.tar.gz frameworks_av-31fb725372f2f62a234c4f43c66504dddeaf3c8f.tar.bz2 | |
am f5230955: am 907e5651: Camera2: Don\'t let unlocks happen during recording.
* commit 'f52309555013e9909b248374f96d22dae29f6454':
Camera2: Don't let unlocks happen during recording.
Diffstat (limited to 'services')
| -rw-r--r-- | services/camera/libcameraservice/Camera2Client.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
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 @@ status_t Camera2Client::unlock() { 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(); |