Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 107dc2d5 authored by Colin Cross's avatar Colin Cross
Browse files

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 425583e6)
parent 4e9bdcdc

services/core/java/com/android/server/am/ActivityManagerService.java

+1 −1
Original line number Diff line number Diff line
@@ -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();

                            }