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

Commit dfa4823d authored by Jayant Chowdhary's avatar Jayant Chowdhary Committed by Automerger Merge Worker
Browse files

Merge "cameraservice: Check for watchdog initialization before timing... 

Merge "cameraservice: Check for watchdog initialization before timing disconnect." into tm-d1-dev am: ee4811eb am: b11ba5b4 am: 92bdecc4

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



Change-Id: I01eea30a3e568057199fcc6f5bf2d82da110b597
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 620763ff 92bdecc4

services/camera/libcameraservice/common/Camera2ClientBase.cpp

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




template <typename TClientBase>

template <typename TClientBase>

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

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

    if (mCameraServiceWatchdog != nullptr) {

        // Initialization from hal succeeded, time disconnect.

        return mCameraServiceWatchdog->WATCH_CUSTOM_TIMER(disconnectImpl(),

        return mCameraServiceWatchdog->WATCH_CUSTOM_TIMER(disconnectImpl(),

                kDisconnectTimeoutMs / kCycleLengthMs, kCycleLengthMs);

                kDisconnectTimeoutMs / kCycleLengthMs, kCycleLengthMs);

    }

    }

    return disconnectImpl();

}





template <typename TClientBase>

template <typename TClientBase>

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

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