| commit | 9fc004e28df1b1beabf27deb265dc882e0cd2dfe | [log] [tgz] |
|---|---|---|
| author | Andy Hung <hunga@google.com> | Mon Nov 09 19:36:49 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Nov 09 19:36:49 2020 +0000 |
| tree | b4711911f83fc220995b0e071afdbadfdc1758e9 | |
| parent | 2ae8676b561497410326efdb64327ee7a392a68c [diff] | |
| parent | 2607485e8216168f0414cfde43eed98a7e4d68b8 [diff] |
Merge "AudioFlinger: Change timeout for FdToString." am: d578bbd330 am: 0210818c13 am: a7805886d5 am: 2607485e82 Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1490687 Change-Id: I5ab419436ea3732a889fe5bb24473614ed3a8d96
diff --git a/services/audioflinger/AudioFlinger.cpp b/services/audioflinger/AudioFlinger.cpp index 4929346..6e8f5be 100644 --- a/services/audioflinger/AudioFlinger.cpp +++ b/services/audioflinger/AudioFlinger.cpp
@@ -3202,7 +3202,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 */);