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

Commit 564ac354 authored by Ravneet Dhanjal's avatar Ravneet Dhanjal Committed by Automerger Merge Worker
Browse files

Merge "Camera: Remove tid and pid from abort message" into udc-dev am: d6e59e88 

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



Change-Id: I14d62108bc95cbb2a183a992fed4b31e29bd7018
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 952e73df d6e59e88

services/camera/libcameraservice/CameraServiceWatchdog.cpp

+3 −5
Original line number Diff line number Diff line
@@ -43,8 +43,7 @@ bool CameraServiceWatchdog::threadLoop() 
            mTidMap[currentThreadId].cycles++;



            if (mTidMap[currentThreadId].cycles >= mMaxCycles) {

                std::string abortMessage = getAbortMessage(getpid(), currentThreadId,

                        mTidMap[currentThreadId].functionName);

                std::string abortMessage = getAbortMessage(mTidMap[currentThreadId].functionName);

                android_set_abort_message(abortMessage.c_str());

                ALOGW("CameraServiceWatchdog triggering abort for pid: %d tid: %d", getpid(),

                        currentThreadId);
@@ -60,10 +59,9 @@ bool CameraServiceWatchdog::threadLoop() 
    return true;

}



std::string CameraServiceWatchdog::getAbortMessage(int pid, int tid, std::string functionName) {

std::string CameraServiceWatchdog::getAbortMessage(const std::string& functionName) {

    std::string res = "CameraServiceWatchdog triggering abort during "

            + functionName + " | pid: " + std::to_string(pid)

            + " tid: " + std::to_string(tid);

            + functionName;

    return res;

}

services/camera/libcameraservice/CameraServiceWatchdog.h

+1 −1
Original line number Diff line number Diff line
@@ -144,7 +144,7 @@ private: 
     */

    void stop(uint32_t tid);



    std::string getAbortMessage(int pid, int tid, std::string functionName);

    std::string getAbortMessage(const std::string& functionName);



    virtual bool    threadLoop();