Merge "CameraService: Updated watchdog disconnect timer"

namespace android {

const static size_t kDisconnectTimeoutMs = 2500;

using namespace camera2;

// Interface used by CameraService

template <typename TClientBase>

binder::Status Camera2ClientBase<TClientBase>::disconnect() {

    if (mCameraServiceWatchdog != nullptr) {

    if (mCameraServiceWatchdog != nullptr && mDevice != nullptr) {

        // Timer for the disconnect call should be greater than getExpectedInFlightDuration

        // since this duration is used to error handle methods in the disconnect sequence

        // thus allowing existing error handling methods to execute first

        uint64_t maxExpectedDuration =

                ns2ms(mDevice->getExpectedInFlightDuration() + kBufferTimeDisconnectNs);

        // Initialization from hal succeeded, time disconnect.

        return mCameraServiceWatchdog->WATCH_CUSTOM_TIMER(disconnectImpl(),

                kDisconnectTimeoutMs / kCycleLengthMs, kCycleLengthMs);

                maxExpectedDuration / kCycleLengthMs, kCycleLengthMs);

    }

    return disconnectImpl();

}

protected:

    // Used for watchdog timeout to monitor disconnect

    static const nsecs_t kBufferTimeDisconnectNs = 3000000000; // 3 sec.

    // The PID provided in the constructor call

    pid_t mInitialClientPid;

    bool mOverrideForPerfClass = false;

    }

    // Calculate expected duration for flush with additional buffer time in ms for watchdog

    uint64_t maxExpectedDuration = (getExpectedInFlightDuration() + kBaseGetBufferWait) / 1e6;

    uint64_t maxExpectedDuration = ns2ms(getExpectedInFlightDuration() + kBaseGetBufferWait);

    status_t res = mCameraServiceWatchdog->WATCH_CUSTOM_TIMER(mRequestThread->flush(),

            maxExpectedDuration / kCycleLengthMs, kCycleLengthMs);