diff options
| author | Ruben Brunk <rubenbrunk@google.com> | 2014-06-23 21:08:15 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-06-20 21:00:34 +0000 |
| commit | ed81ebc3c55e344ff511d283eaa8af31db9503c3 (patch) | |
| tree | 07a26a2104d3082d781448d59c54323711d36f73 /core/java/android/hardware | |
| parent | 97a6c20a6a52c9429ed2c8837086f3003e5da274 (diff) | |
| parent | 53284d5816f065b2de20dcb019fa1096b148eee4 (diff) | |
| download | frameworks_base-ed81ebc3c55e344ff511d283eaa8af31db9503c3.zip frameworks_base-ed81ebc3c55e344ff511d283eaa8af31db9503c3.tar.gz frameworks_base-ed81ebc3c55e344ff511d283eaa8af31db9503c3.tar.bz2 | |
Merge "camera2: Fix frame ID returned by legacy mode shim."
Diffstat (limited to 'core/java/android/hardware')
| -rw-r--r-- | core/java/android/hardware/camera2/legacy/RequestQueue.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/core/java/android/hardware/camera2/legacy/RequestQueue.java b/core/java/android/hardware/camera2/legacy/RequestQueue.java index 6bedc48..7820648 100644 --- a/core/java/android/hardware/camera2/legacy/RequestQueue.java +++ b/core/java/android/hardware/camera2/legacy/RequestQueue.java @@ -77,7 +77,8 @@ public class RequestQueue { long ret = INVALID_FRAME; if (mRepeatingRequest != null && mRepeatingRequest.getRequestId() == requestId) { mRepeatingRequest = null; - ret = mCurrentRepeatingFrameNumber; + ret = (mCurrentRepeatingFrameNumber == INVALID_FRAME) ? INVALID_FRAME : + mCurrentRepeatingFrameNumber - 1; mCurrentRepeatingFrameNumber = INVALID_FRAME; } else { Log.e(TAG, "cancel failed: no repeating request exists for request id: " + requestId); @@ -105,7 +106,8 @@ public class RequestQueue { long ret = INVALID_FRAME; if (burst.isRepeating()) { if (mRepeatingRequest != null) { - ret = mCurrentRepeatingFrameNumber; + ret = (mCurrentRepeatingFrameNumber == INVALID_FRAME) ? INVALID_FRAME : + mCurrentRepeatingFrameNumber - 1; } mCurrentRepeatingFrameNumber = INVALID_FRAME; mRepeatingRequest = burst; |