Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a6587338 authored by Eino-Ville Talvala's avatar Eino-Ville Talvala Committed by android-build-merger
Browse files

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

am: 5856779c

* commit '5856779c':
  Camera2: Ignore exception on double-completed capture sequences.

Change-Id: I7905d6ef70ba031736fcc2cea9f1ffdabe09851e
parents f4c21179 5856779c

core/java/android/hardware/camera2/impl/CameraCaptureSessionImpl.java

+6 −1
Original line number Original line Diff line number Diff line
@@ -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) {

        try {

            mSequenceDrainer.taskFinished(sequenceId);

            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 {