commit c83d7c4a24e98f714d9f2f8b68e1292356e17fec
author Ravneet <rdhanjal@google.com> Fri Jun 03 20:51:58 2022 +0000
committer Ravneet Dhanjal <rdhanjal@google.com> Fri Jun 10 04:05:43 2022 +0000
tree 194a1f54511fa0a1b4b02356e0c431bbea4615f3
parent 756eb6bac99453e7a16eaa843b4968c614900388

cameraserver: Exit watchdog for disconnect call

- Add requestExit for watchdog call added for
disconnect

Test: Manual; Used debuggerd to confirm watchdog thread
count remained stable
Bug: 235427445
Change-Id: Ibc5a14981a645ded7c7de97ef68f9aa03f794145

services/camera/libcameraservice/common/Camera2ClientBase.cpp

diff --git a/services/camera/libcameraservice/common/Camera2ClientBase.cpp b/services/camera/libcameraservice/common/Camera2ClientBase.cpp
index f2a7d52..32ac401 100644
--- a/services/camera/libcameraservice/common/Camera2ClientBase.cpp
+++ b/services/camera/libcameraservice/common/Camera2ClientBase.cpp
@@ -162,6 +162,11 @@
 
     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(),