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

Commit bdbc5ade authored by Ravneet Dhanjal's avatar Ravneet Dhanjal Committed by Automerger Merge Worker
Browse files

Merge "cameraserver: Exit watchdog for disconnect call" into tm-d1-dev am:... 

Merge "cameraserver: Exit watchdog for disconnect call" into tm-d1-dev am: 46c7315c am: f7476d96 am: a144108f

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



Change-Id: Iaa152fa89ec768528791556c95bf5b52b3d11dfb
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a249ff60 a144108f

services/camera/libcameraservice/common/Camera2ClientBase.cpp

+5 −0
Original line number Diff line number Diff line
@@ -163,6 +163,11 @@ Camera2ClientBase<TClientBase>::~Camera2ClientBase() { 


    disconnect();



    if (mCameraServiceWatchdog != NULL) {

        mCameraServiceWatchdog->requestExit();

        mCameraServiceWatchdog.clear();

    }



    ALOGI("Closed Camera %s. Client was: %s (PID %d, UID %u)",

            TClientBase::mCameraIdStr.string(),

            String8(TClientBase::mClientPackageName).string(),