commit f6be7d177a740f86a4ae3b8685cc9e2f31506352
author Craig Mautner <cmautner@google.com> Tue Dec 02 18:57:34 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Dec 02 18:57:36 2014 +0000
tree bb2579730340cf12bb32c3fa793576f21809ffe8
parent f54954f97599f83584ab736d931b1fe1aff8890c
parent 62cfde14423922948928c40eddd212d1dc51d591

Merge "[ActivityManager] Fix race condition in pss collection"

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

diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
index d2ee4fe..4cbf019 100755
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -1836,7 +1836,9 @@
                 break;
             }
             case REQUEST_ALL_PSS_MSG: {
-                requestPssAllProcsLocked(SystemClock.uptimeMillis(), true, false);
+                synchronized (ActivityManagerService.this) {
+                    requestPssAllProcsLocked(SystemClock.uptimeMillis(), true, false);
+                }
                 break;
             }
             case START_PROFILES_MSG: {