Snap for 10082168 from d6e59e88ea7f699e7d5fa995251fd075cfd8be83 to udc-release (fb249311) · Commits · e / os / android_frameworks_av

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

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