Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "camera2: Fix frame ID returned by legacy mode shim."

Browse Source
This commit is contained in:
Ruben Brunk
2014-06-23 21:08:15 +00:00
committed by Android (Google) Code Review
parent 97a6c20a6a 53284d5816
commit ed81ebc3c5
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/hardware/camera2/legacy/RequestQueue.java
View File

@@ -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;