| commit | a7805886d569c29151104f0be80ed61616c1c8a7 | [log] [tgz] |
|---|---|---|
| author | Andy Hung <hunga@google.com> | Mon Nov 09 18:52:35 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Nov 09 18:52:35 2020 +0000 |
| tree | 7c8d042accdec3d3727a20649451bdb5ab3caf80 | |
| parent | e7e87e61aa96ba774b9fe07d5fd8021eadf9f69c [diff] | |
| parent | 0210818c139dd84f57043befbcb0ea5ae873d910 [diff] |
Merge "AudioFlinger: Change timeout for FdToString." am: d578bbd330 am: 0210818c13 Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1490687 Change-Id: Ia6fff2bdcceb0e76685c38a7b1217816a93a852a
diff --git a/services/audioflinger/AudioFlinger.cpp b/services/audioflinger/AudioFlinger.cpp index 1935cde..5f0b575 100644 --- a/services/audioflinger/AudioFlinger.cpp +++ b/services/audioflinger/AudioFlinger.cpp
@@ -3141,7 +3141,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 */);