commit c6412e7815af12048527c8e457b3b40ef45b00c7
author TreeHugger Robot <treehugger-gerrit@google.com> Mon Jun 27 17:54:43 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jun 27 17:54:43 2022 +0000
tree 5badd4b849091b18fb217f39fb68fb8f176eec6b
parent 0e84349c12f1ac7024283f6327b872aa7a42605f
parent 8d6bdd10b3078994885e2200a68928536f28d71f

Merge "Camera: Generate tombstone when watchdog bites" into tm-dev

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();
             }
         }
     }