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

Commit 7e718965 authored by Eino-Ville Talvala's avatar Eino-Ville Talvala
Browse files

Camera2: Ignore exception on double-completed capture sequences. 

As a workaround for b/27870771, convert fatal exception into a
warning.

Duplicate calls to finishPendingSequence with the same sequenceId
are seen in user crash reports, but with no further context and
inability to reproduce after testing various hypothesis, just
warn about it happening.

Bug: 27870771
Change-Id: Icd7d408887e04b94092689ce61809d6c664d8e3a
parent 6ada7029

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 {