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

Merge "Camera2: Ignore exception on double-completed capture sequences." into nyc-dev

Browse Source
This commit is contained in:
Eino-Ville Talvala
2016-04-20 23:55:09 +00:00
committed by Android (Google) Code Review
parent 75fe7d5d79 7e71896561
commit 5856779c3a
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/android/hardware/camera2/impl/CameraCaptureSessionImpl.java
View File

@@ -628,7 +628,12 @@ public class CameraCaptureSessionImpl extends CameraCaptureSession
* close the camera further by unconfiguring and then firing {@code onClosed}.</p> * close the camera further by unconfiguring and then firing {@code onClosed}.</p>
*/ */
private void finishPendingSequence(int sequenceId) { private void finishPendingSequence(int sequenceId) {
mSequenceDrainer.taskFinished(sequenceId); try {
mSequenceDrainer.taskFinished(sequenceId);
} catch (IllegalStateException e) {
// Workaround for b/27870771
Log.w(TAG, e.getMessage());
}
} }
private class SequenceDrainListener implements TaskDrainer.DrainListener { private class SequenceDrainListener implements TaskDrainer.DrainListener {