Increase timemout for dumpsys meminfo --unreachable

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)

diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
index a8e63f6..0a95e2a 100644 (file)
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -18906,7 +18906,7 @@ public class ActivityManagerService extends IActivityManager.Stub
                                 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();
                             }