commit 9f3503d2e28e7d23464a9cc4f4785beda189b657
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Tue Jun 28 07:46:07 2022 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Tue Jun 28 07:46:07 2022 +0000
tree 5badd4b849091b18fb217f39fb68fb8f176eec6b
parent 7de5edeaabf8b7f8d811f70bcfb2b66f755083d9
parent 8782935ca9fd8c87d52eaa2511d3407b1f4c0237

Snap for 8776306 from 8782935ca9fd8c87d52eaa2511d3407b1f4c0237 to mainline-mediaprovider-release

Change-Id: Iccf8000fe8c6534c593b66ae6a3570c00279a2e1

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