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

Commit ee4811eb authored by Jayant Chowdhary's avatar Jayant Chowdhary Committed by Android (Google) Code Review
Browse files

Merge "cameraservice: Check for watchdog initialization before timing disconnect." into tm-d1-dev

parents 266922e6 3f20d19b

services/camera/libcameraservice/common/Camera2ClientBase.cpp

+6 −2
Original line number Diff line number Diff line
@@ -247,9 +247,13 @@ status_t Camera2ClientBase<TClientBase>::dumpDevice( 


template <typename TClientBase>

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

    if (mCameraServiceWatchdog != nullptr) {

        // Initialization from hal succeeded, time disconnect.

        return mCameraServiceWatchdog->WATCH_CUSTOM_TIMER(disconnectImpl(),

                kDisconnectTimeoutMs / kCycleLengthMs, kCycleLengthMs);

    }

    return disconnectImpl();

}



template <typename TClientBase>

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