dumpsys meminfo --unreachable can take longer than 5 seconds,
especially when combined with malloc_debug. Increase the
timeout to 30 seconds when dumpUnreachable is set.
Bug:
79354139
Test: dumpsys meminfo --unreachable -a
Change-Id: Id1001cbc9dd5123907281e9965d10c0887feb9dc
Merged-In: Id1001cbc9dd5123907281e9965d10c0887feb9dc
(cherry picked from commit
425583e64f8b31517e66a912c7240fcbfc667764)
thread.dumpMemInfo(tp.getWriteFd(),
mi, opts.isCheckinRequest, opts.dumpFullDetails,
opts.dumpDalvik, opts.dumpSummaryOnly, opts.dumpUnreachable, innerArgs);
- tp.go(fd);
+ tp.go(fd, opts.dumpUnreachable ? 30000 : 5000);
} finally {
tp.kill();
}