commit 8ca23dca1cd450b4d93e8da1c8bd6f6ee61e2f5f
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

Camera: fix race in onRepeatingRequestError callback

Test: CTS
Bug: 64180296
Change-Id: I620e238bf1f4e7ab72911b6e68c689580fba22f1

camera/tests/CameraBinderTests.cpp

diff --git a/camera/tests/CameraBinderTests.cpp b/camera/tests/CameraBinderTests.cpp
index 946e3b8..51d9214 100644
--- a/camera/tests/CameraBinderTests.cpp
+++ b/camera/tests/CameraBinderTests.cpp
@@ -217,8 +217,10 @@
         return binder::Status::ok();
     }
 
-    virtual binder::Status onRepeatingRequestError(int64_t lastFrameNumber) {
+    virtual binder::Status onRepeatingRequestError(
+            int64_t lastFrameNumber, int32_t stoppedSequenceId) {
         (void) lastFrameNumber;
+        (void) stoppedSequenceId;
         Mutex::Autolock l(mLock);
         mLastStatus = REPEATING_REQUEST_ERROR;
         mStatusesHit.push_back(mLastStatus);