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

Commit 509f7777 authored by Eino-Ville Talvala's avatar Eino-Ville Talvala Committed by Android (Google) Code Review
Browse files

Merge "Camera2: Make sure aborting captures on an idle device works." into lmp-dev

parents 9adfa37c c346bbf7
Loading
Loading
Loading
Loading
+7 −0
Original line number Diff line number Diff line
@@ -721,6 +721,13 @@ public class CameraDeviceImpl extends CameraDevice {
            checkIfCameraClosedOrInError();

            mDeviceHandler.post(mCallOnBusy);

            // If already idle, just do a busy->idle transition immediately, don't actually
            // flush.
            if (mIdle) {
                mDeviceHandler.post(mCallOnIdle);
                return;
            }
            try {
                LongParcelable lastFrameNumberRef = new LongParcelable();
                mRemoteDevice.flush(/*out*/lastFrameNumberRef);