commit d722067c74786ab5683405e6caef1ca25543ac7f
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Tue Jun 28 01:29:32 2022 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Tue Jun 28 01:29:32 2022 +0000
tree 5badd4b849091b18fb217f39fb68fb8f176eec6b
parent 32350090409eb8b345e4e91e96b630c4a83d2ecd
parent ff914c3415155390c3e0b6190ef63be9a9d4e439

Merge cherrypicks of [19068989] into tm-release.

Change-Id: Ib545e11483db9cf357179755e0d214411a224028

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