| commit | 34713c04b5e1a897b0fd905a89622059a787f7a7 | [log] [tgz] |
|---|---|---|
| author | Shuzhen Wang <shuzhenwang@google.com> | Tue Apr 26 07:35:03 2016 -0700 |
| committer | Shuzhen Wang <shuzhenwang@google.com> | Tue Apr 26 14:18:47 2016 -0700 |
| tree | d685b643dc64dc3958edf4bbc2fab53c2ec2e6f0 | |
| parent | c3c06c4fe329d07bd7d442206bc9eb63e92bf5bd [diff] [blame] |
Camera: Do not signal AutoConditionLock if acquisition times out It's possible for AutoConditionLock to time out in waitAndAcquire while waiting for the condition. In this case, we don't want to reset the state because others may be holding the condition without lock. Bug: 28295136 Change-Id: Ife90232daef8fd0d31acf9e52cfbcf542987e3fa
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