From 425583e64f8b31517e66a912c7240fcbfc667764 Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Wed, 12 Jul 2017 13:58:30 -0700
Subject: [PATCH] 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
---
 .../core/java/com/android/server/am/ActivityManagerService.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
index f25f50646617e..bf59cdee12f96 100644
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -18785,7 +18785,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();
                             }