commit 620763ff3690e562e95ff2457adc24156dfa8127
author Jayant Chowdhary <jchowdhary@google.com> Fri May 27 05:37:14 2022 +0000
committer Jayant Chowdhary <jchowdhary@google.com> Tue Jun 07 11:39:41 2022 -0700
tree aa9d1cafa849cba85a516ea8d4718cfe1e18cec3
parent 92a9a0d3070faa65698529d024271e4898a56ba0

cameraserver: Add watchdog timer for disconnect.

Bug: 228641945

Test: Add artifical delay of 2 seconds in disconnectImpl, see tombstone

Change-Id: I11254e04d9d883e839dc1a7eee309e249613957e
Signed-off-by: Jayant Chowdhary <jchowdhary@google.com>
(cherry picked from commit 48162a773f8a62f3f131a2740e6bed51a6be6e75)

services/camera/libcameraservice/CameraServiceWatchdog.cpp

diff --git a/services/camera/libcameraservice/CameraServiceWatchdog.cpp b/services/camera/libcameraservice/CameraServiceWatchdog.cpp
index 950da6a..e101dd3 100644
--- a/services/camera/libcameraservice/CameraServiceWatchdog.cpp
+++ b/services/camera/libcameraservice/CameraServiceWatchdog.cpp
@@ -41,8 +41,10 @@
             tidToCycleCounterMap[currentThreadId]++;
 
             if (tidToCycleCounterMap[currentThreadId] >= mMaxCycles) {
-                ALOGW("CameraServiceWatchdog triggering kill for pid: %d", getpid());
-                kill(getpid(), SIGKILL);
+                ALOGW("CameraServiceWatchdog triggering abort for pid: %d", getpid());
+                // We use abort here so we can get a tombstone for better
+                // debugging.
+                abort();
             }
         }
     }