Merge "Whoops, need to acquire lock." into ics-mr1

1 files changed, 10 insertions, 8 deletions

diff --git a/services/java/com/android/server/am/ActivityManagerService.java b/services/java/com/android/server/am/ActivityManagerService.java
index b6f1184..c0af2f6 100644
--- a/services/java/com/android/server/am/ActivityManagerService.java
+++ b/services/java/com/android/server/am/ActivityManagerService.java
@@ -1211,8 +1211,8 @@ public final class ActivityManagerService extends ActivityManagerNative
                 }
                 synchronized (ActivityManagerService.this) {
                     long now = SystemClock.uptimeMillis();
-                    if (now < (mLastMemUsageReportTime+10000)) {
-                        // Don't report more than every 10 seconds to somewhat
+                    if (now < (mLastMemUsageReportTime+5*60*1000)) {
+                        // Don't report more than every 5 minutes to somewhat
                         // avoid spamming.
                         return;
                     }
@@ -1250,12 +1250,14 @@ public final class ActivityManagerService extends ActivityManagerNative
                         PrintWriter catPw = new PrintWriter(catSw);
                         String[] emptyArgs = new String[] { };
                         StringBuilder tag = new StringBuilder(128);
-                        dumpProcessesLocked(null, catPw, emptyArgs, 0, false);
-                        catPw.println();
-                        dumpServicesLocked(null, catPw, emptyArgs, 0, false, false);
-                        catPw.println();
-                        dumpActivitiesLocked(null, catPw, emptyArgs, 0, false, false);
-                        catPw.println();
+                        synchronized (ActivityManagerService.this) {
+                            dumpProcessesLocked(null, catPw, emptyArgs, 0, false);
+                            catPw.println();
+                            dumpServicesLocked(null, catPw, emptyArgs, 0, false, false);
+                            catPw.println();
+                            dumpActivitiesLocked(null, catPw, emptyArgs, 0, false, false);
+                            catPw.println();
+                        }
                         tag.append("Low on memory -- ");
                         dumpApplicationMemoryUsage(null, pw, "  ", emptyArgs, true, catPw, tag);
                         String memUsage = sw.toString();