commit 3f20d19b2940098995e20d682d78d78470f07558
author Jayant Chowdhary <jchowdhary@google.com> Tue May 31 17:24:39 2022 +0000
committer Jayant Chowdhary <jchowdhary@google.com> Tue Jun 07 21:02:14 2022 +0000
tree 440fb02ae9d4beadc08fc197ecb8cde161caf8c3
parent 48162a773f8a62f3f131a2740e6bed51a6be6e75

cameraservice: Check for watchdog initialization before timing disconnect.

Bug: 234330877
Bug: 234544015

Test: atest MultiViewTest#testDualCameraPreview passes

Change-Id: I665851f10eb2153844a3dbe248b5b4dae756dc50
Signed-off-by: Jayant Chowdhary <jchowdhary@google.com>

services/camera/libcameraservice/common/Camera2ClientBase.cpp

diff --git a/services/camera/libcameraservice/common/Camera2ClientBase.cpp b/services/camera/libcameraservice/common/Camera2ClientBase.cpp
index 6d40a55..2201776 100644
--- a/services/camera/libcameraservice/common/Camera2ClientBase.cpp
+++ b/services/camera/libcameraservice/common/Camera2ClientBase.cpp
@@ -248,8 +248,12 @@
 
 template <typename TClientBase>
 binder::Status Camera2ClientBase<TClientBase>::disconnect() {
-    return mCameraServiceWatchdog->WATCH_CUSTOM_TIMER(disconnectImpl(),
-            kDisconnectTimeoutMs / kCycleLengthMs, kCycleLengthMs);
+    if (mCameraServiceWatchdog != nullptr) {
+        // Initialization from hal succeeded, time disconnect.
+        return mCameraServiceWatchdog->WATCH_CUSTOM_TIMER(disconnectImpl(),
+                kDisconnectTimeoutMs / kCycleLengthMs, kCycleLengthMs);
+    }
+    return disconnectImpl();
 }
 
 template <typename TClientBase>