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

Commit a7d12c80 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... 

Merge "Camera2: Ignore exception on double-completed capture sequences." into nyc-dev am: 5856779c am: 896a1a42
am: 4006ef1d

* commit '4006ef1d':
  Camera2: Ignore exception on double-completed capture sequences.

Change-Id: I7434e3ff65958466ce6624ba8dffd2e47a07ca11
parents 16aaf6bd 4006ef1d

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

+6 −1
Original line number 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>

     */

    private void finishPendingSequence(int sequenceId) {

        try {

            mSequenceDrainer.taskFinished(sequenceId);

        } catch (IllegalStateException e) {

            // Workaround for b/27870771

            Log.w(TAG, e.getMessage());

        }

    }



    private class SequenceDrainListener implements TaskDrainer.DrainListener {