Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit da257272 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/19068989



Change-Id: I1daf8c90e5cf81321826908077f20f07de953bec
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 01b07254 c6412e78

services/camera/libcameraservice/CameraServiceWatchdog.cpp

+4 −2
Original line number Diff line number Diff line
@@ -41,8 +41,10 @@ bool CameraServiceWatchdog::threadLoop() 
            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();

            }

        }

    }