diff options
| author | Jianing Wei <jianingwei@google.com> | 2014-04-21 11:34:34 -0700 |
|---|---|---|
| committer | Jianing Wei <jianingwei@google.com> | 2014-04-21 11:34:34 -0700 |
| commit | 3c76fa3e73374dfe7bb93e1b03fed30749e1e4b9 (patch) | |
| tree | a316962310eaa4fd603c88ec6149eeb0cab16e76 /services/camera/libcameraservice/api2 | |
| parent | 77d4f613bbed8b646c8ddade6a0737fcbd391b07 (diff) | |
| download | frameworks_av-3c76fa3e73374dfe7bb93e1b03fed30749e1e4b9.zip frameworks_av-3c76fa3e73374dfe7bb93e1b03fed30749e1e4b9.tar.gz frameworks_av-3c76fa3e73374dfe7bb93e1b03fed30749e1e4b9.tar.bz2 | |
CameraService: fix waitUntilIdle bug revealed by TestingCamera2.
* clear mStreamingRequestList in flush
* fix frame number checker in notify and processCaptureResult
Bug: 14166437
Change-Id: I022421080d05138f9068c1b9b85d83bd613b04fb
Diffstat (limited to 'services/camera/libcameraservice/api2')
| -rw-r--r-- | services/camera/libcameraservice/api2/CameraDeviceClient.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/services/camera/libcameraservice/api2/CameraDeviceClient.cpp b/services/camera/libcameraservice/api2/CameraDeviceClient.cpp index 3d85e90..5a48a62 100644 --- a/services/camera/libcameraservice/api2/CameraDeviceClient.cpp +++ b/services/camera/libcameraservice/api2/CameraDeviceClient.cpp @@ -497,6 +497,7 @@ status_t CameraDeviceClient::flush(int64_t* lastFrameNumber) { if (!mDevice.get()) return DEAD_OBJECT; + mStreamingRequestList.clear(); return mDevice->flush(lastFrameNumber); } |