| commit | 62223f521050349b9d67d7392d811f9a1f18b349 | [log] [tgz] |
|---|---|---|
| author | Rhed Jao <rhedjao@google.com> | Thu Jan 07 03:41:22 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jan 07 03:41:22 2021 +0000 |
| tree | af35ebb77f758ad7b77978913ad2d6c1277dba68 | |
| parent | f8ba311c06ec6411defc1607c8c68cee853562fc [diff] | |
| parent | 96002aa91e9006c474f2bcf83dca8a9ea0ad0e77 [diff] |
Merge "Dumpsys: stop writing when timed-out" am: 96002aa91e Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1534573 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I63f0031e75d0ca5c635dbc8f0236badaeaa1ff51
diff --git a/cmds/dumpsys/dumpsys.cpp b/cmds/dumpsys/dumpsys.cpp index 1327cfd..a017246 100644 --- a/cmds/dumpsys/dumpsys.cpp +++ b/cmds/dumpsys/dumpsys.cpp
@@ -427,7 +427,7 @@ << strerror(errno) << std::endl; status = -errno; break; - } else if (rc == 0) { + } else if (rc == 0 || time_left_ms() == 0) { status = TIMED_OUT; break; }