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

Commit 769728f1 authored by Alex Ray's avatar Alex Ray Committed by Android (Google) Code Review
Browse files

Merge "Camera: fix waitUntilDrained log message" into jb-mr2-dev

parents edb86fe5 c13c8bc6

services/camera/libcameraservice/Camera2Device.cpp

+1 −1
Original line number Diff line number Diff line
@@ -426,7 +426,7 @@ status_t Camera2Device::waitUntilDrained() { 
        totalTime += kSleepTime;

        if (totalTime > kMaxSleepTime) {

            ALOGE("%s: Waited %d us, %d requests still in flight", __FUNCTION__,

                    mHal2Device->ops->get_in_progress_count(mHal2Device), totalTime);

                    totalTime, mHal2Device->ops->get_in_progress_count(mHal2Device));

            return TIMED_OUT;

        }

    }