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

Commit 4a6a6d44 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Camera: Reset mExpectedMinDuration during configureStreams" into tm-dev... 

Merge "Camera: Reset mExpectedMinDuration during configureStreams" into tm-dev am: 96368f07 am: 7de5fcc5 am: abe3e7f0

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/18915945



Change-Id: I26bd60c45c4a2a0104ca406a20707851691d80d1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents db5aeb25 abe3e7f0

services/camera/libcameraservice/device3/Camera3Device.cpp

+3 −0
Original line number Original line Diff line number Diff line
@@ -2291,6 +2291,9 @@ status_t Camera3Device::configureStreamsLocked(int operatingMode, 
        mOperatingMode = operatingMode;

        mOperatingMode = operatingMode;

    }

    }





    // Reset min expected duration when session is reconfigured.

    mMinExpectedDuration = 0;



    // In case called from configureStreams, abort queued input buffers not belonging to

    // In case called from configureStreams, abort queued input buffers not belonging to

    // any pending requests.

    // any pending requests.

    if (mInputStream != NULL && notifyRequestThread) {

    if (mInputStream != NULL && notifyRequestThread) {