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

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

Merge "Camera3Device: Treat failure to idle as an error" into lmp-dev

parents 2a6074c4 9c8a0914

services/camera/libcameraservice/device3/Camera3Device.cpp

+4 −0
Original line number Diff line number Diff line
@@ -1092,6 +1092,10 @@ status_t Camera3Device::waitUntilDrainedLocked() { 


    ALOGV("%s: Camera %d: Waiting until idle", __FUNCTION__, mId);

    status_t res = waitUntilStateThenRelock(/*active*/ false, kShutdownTimeout);

    if (res != OK) {

        SET_ERR_L("Error waiting for HAL to drain: %s (%d)", strerror(-res),

                res);

    }

    return res;

}