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

Commit b11ba5b4 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

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



Change-Id: I7ba9bdb84e4b540cdff701f1ed97d2e9cf3c82ea
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5b5524ad ee4811eb

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() {