diff options
| author | 2021-01-07 04:07:23 +0000 | |
|---|---|---|
| committer | 2021-01-07 04:07:23 +0000 | |
| commit | a8464c4efad2da5db784f103234d14bf8b85468c (patch) | |
| tree | da29beee8b0a14e99e09d29d6db51007a13fdf2f | |
| parent | c1afad7855dd5821069f71c921baa2f9d6d8df29 (diff) | |
| parent | 62223f521050349b9d67d7392d811f9a1f18b349 (diff) | |
Merge "Dumpsys: stop writing when timed-out" am: 96002aa91e am: 62223f5210
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1534573
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ideffc1368bcc668967974886dbd8e1c89b171cc3
| -rw-r--r-- | cmds/dumpsys/dumpsys.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmds/dumpsys/dumpsys.cpp b/cmds/dumpsys/dumpsys.cpp index 1327cfd155..a017246184 100644 --- a/cmds/dumpsys/dumpsys.cpp +++ b/cmds/dumpsys/dumpsys.cpp @@ -427,7 +427,7 @@ status_t Dumpsys::writeDump(int fd, const String16& serviceName, std::chrono::mi << strerror(errno) << std::endl; status = -errno; break; - } else if (rc == 0) { + } else if (rc == 0 || time_left_ms() == 0) { status = TIMED_OUT; break; } |