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

Merge "Camera: Avoid removing valid repeating requests" am: 0e7782c87b

Browse Source 
am: a491caf3fb

Change-Id: Ia6e5cfabdea60d3dffb018f15b4fa1a4224a153c
This commit is contained in:
Emilian Peev
2019-12-04 07:42:25 -08:00
committed by android-build-merger
parent 4989c8886a a491caf3fb
commit 468c1263cf
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -30,7 +30,7 @@ import java.util.List;
public class RequestQueue {
private static final String TAG = "RequestQueue";
private static final long INVALID_FRAME = -1;
public static final long INVALID_FRAME = -1;
private BurstHolder mRepeatingRequest = null;
private final ArrayDeque<BurstHolder> mRequestQueue = new ArrayDeque<BurstHolder>();

9
core/java/android/hardware/camera2/legacy/RequestThreadManager.java
View File

@@ -948,8 +948,13 @@ public class RequestThreadManager {
Log.d(TAG, "Stopped repeating request. Last frame number is " +
lastFrameNumber);
}
mDeviceState.setRepeatingRequestError(lastFrameNumber,
burstHolder.getRequestId());
if (lastFrameNumber != RequestQueue.INVALID_FRAME) {
mDeviceState.setRepeatingRequestError(lastFrameNumber,
burstHolder.getRequestId());
} else {
Log.e(TAG, "Repeating request id: " + burstHolder.getRequestId() +
" already canceled!");
}
}
if (DEBUG) {