| commit | 2607485e8216168f0414cfde43eed98a7e4d68b8 | [log] [tgz] |
|---|---|---|
| author | Andy Hung <hunga@google.com> | Mon Nov 09 19:21:09 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Nov 09 19:21:09 2020 +0000 |
| tree | fa529b65f690f3c6d5361b6b02c275ea4fc4298f | |
| parent | b1ac89483263297e040914c6bdf30d80a4be8255 [diff] | |
| parent | a7805886d569c29151104f0be80ed61616c1c8a7 [diff] |
Merge "AudioFlinger: Change timeout for FdToString." am: d578bbd330 am: 0210818c13 am: a7805886d5 Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1490687 Change-Id: Icc32d00d2e8b9dafc8f5deaa4975e9266d2fe5cf
diff --git a/services/audioflinger/AudioFlinger.cpp b/services/audioflinger/AudioFlinger.cpp index ef746f4..8fe18de 100644 --- a/services/audioflinger/AudioFlinger.cpp +++ b/services/audioflinger/AudioFlinger.cpp
@@ -3142,7 +3142,8 @@ // dumpToThreadLog_l() must be called with AudioFlinger::mLock held void AudioFlinger::dumpToThreadLog_l(const sp<ThreadBase> &thread) { - audio_utils::FdToString fdToString; + constexpr int THREAD_DUMP_TIMEOUT_MS = 2; + audio_utils::FdToString fdToString("- ", THREAD_DUMP_TIMEOUT_MS); const int fd = fdToString.fd(); if (fd >= 0) { thread->dump(fd, {} /* args */);