commit 7c9d0c9d8f3defd8ee25a4ebda3b1e2bacd550ff
author Shuzhen Wang <shuzhenwang@google.com> Wed Apr 27 00:25:05 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Apr 27 00:25:05 2016 +0000
tree 27a0043cfb5f5e37fc0a81ee65c5e141e1bfa55c
parent 13cf470f5c0e1542826e59a019e89046d15e65cf
parent bb6ac1823f7a3d74fbfac841dc74da556f05d2e7

Merge "Camera: Do not signal AutoConditionLock if acquisition times out" into nyc-dev
am: bb6ac18

* commit 'bb6ac1823f7a3d74fbfac841dc74da556f05d2e7':
  Camera: Do not signal AutoConditionLock if acquisition times out

Change-Id: Id82748484941cfee19f989a953fc871f50239180

services/camera/libcameraservice/utils/AutoConditionLock.cpp

diff --git a/services/camera/libcameraservice/utils/AutoConditionLock.cpp b/services/camera/libcameraservice/utils/AutoConditionLock.cpp
index c8ee965..ed80a95 100644
--- a/services/camera/libcameraservice/utils/AutoConditionLock.cpp
+++ b/services/camera/libcameraservice/utils/AutoConditionLock.cpp
@@ -24,13 +24,15 @@
 
 // Locks manager-owned mutex
 AutoConditionLock::AutoConditionLock(const std::shared_ptr<WaitableMutexWrapper>& manager) :
-        mManager{manager}, mAutoLock{manager->mMutex} {}
+        mManager{manager}, mAutoLock{manager->mMutex}, mAcquired(false) {}
 
 // Unlocks manager-owned mutex
 AutoConditionLock::~AutoConditionLock() {
     // Unset the condition and wake everyone up before releasing lock
-    mManager->mState = false;
-    mManager->mCondition.broadcast();
+    if (mAcquired) {
+        mManager->mState = false;
+        mManager->mCondition.broadcast();
+    }
 }
 
 std::unique_ptr<AutoConditionLock> AutoConditionLock::waitAndAcquire(
@@ -59,6 +61,7 @@
 
     // Set the condition and return
     manager->mState = true;
+    scopedLock->mAcquired = true;
     return scopedLock;
 }
 
@@ -84,6 +87,7 @@
 
     // Set the condition and return
     manager->mState = true;
+    scopedLock->mAcquired = true;
     return scopedLock;
 }
 

services/camera/libcameraservice/utils/AutoConditionLock.h

diff --git a/services/camera/libcameraservice/utils/AutoConditionLock.h b/services/camera/libcameraservice/utils/AutoConditionLock.h
index 9a3eafc..b7f167b 100644
--- a/services/camera/libcameraservice/utils/AutoConditionLock.h
+++ b/services/camera/libcameraservice/utils/AutoConditionLock.h
@@ -92,6 +92,7 @@
 
     std::shared_ptr<WaitableMutexWrapper> mManager;
     Mutex::Autolock mAutoLock;
+    bool mAcquired;
 };
 
 }; // namespace android