commit 8d6bdd10b3078994885e2200a68928536f28d71f
author Shuzhen Wang <shuzhenwang@google.com> Fri Jun 24 15:50:06 2022 -0700
committer Shuzhen Wang <shuzhenwang@google.com> Mon Jun 27 17:30:37 2022 +0000
tree 2e48ba232a584e7bf9feb97c0e37c9c3b3f44921
parent 0b6f7b007c3aa080df6f33a57e7d15d0fe50db57

Camera: Generate tombstone when watchdog bites

Bug: 237118046
Test: Add artificial delay of 20 seconds in close, see tombstone
Change-Id: I9b90f8cdb04f4b96bb8b26eb60db6b842481fca1
Merged-In: I11254e04d9d883e839dc1a7eee309e249613957e

services/camera/libcameraservice/CameraServiceWatchdog.cpp

diff --git a/services/camera/libcameraservice/CameraServiceWatchdog.cpp b/services/camera/libcameraservice/CameraServiceWatchdog.cpp
index fcd6ebe..a169667 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();
             }
         }
     }