commit | 8ca23dca1cd450b4d93e8da1c8bd6f6ee61e2f5f | [log] [tgz] |
---|---|---|
author | Yin-Chia Yeh <yinchiayeh@google.com> | Tue Sep 05 18:15:56 2017 -0700 |
committer | Yin-Chia Yeh <yinchiayeh@google.com> | Tue Sep 05 18:15:56 2017 -0700 |
tree | 259191c6f2a13395c27c8095d00bfcbf3e926616 | |
parent | 90153cae7ffd321338f90678a80abd62fb56e877 [diff] |
Camera: fix race in onRepeatingRequestError callback Test: CTS Bug: 64180296 Change-Id: I620e238bf1f4e7ab72911b6e68c689580fba22f1
diff --git a/services/camera/libcameraservice/api2/CameraDeviceClient.cpp b/services/camera/libcameraservice/api2/CameraDeviceClient.cpp index 6fd9263..c03e8a2 100644 --- a/services/camera/libcameraservice/api2/CameraDeviceClient.cpp +++ b/services/camera/libcameraservice/api2/CameraDeviceClient.cpp
@@ -1354,7 +1354,7 @@ sp<hardware::camera2::ICameraDeviceCallbacks> remoteCb = getRemoteCallback(); if (remoteCb != 0) { - remoteCb->onRepeatingRequestError(lastFrameNumber); + remoteCb->onRepeatingRequestError(lastFrameNumber, mStreamingRequestId); } Mutex::Autolock idLock(mStreamingRequestIdLock);