commit 799cb730298591a9d7303ea051451a3b6dc8e51f
author Craig Mautner <cmautner@google.com> Thu Dec 04 21:51:55 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Dec 04 21:52:06 2014 +0000
tree 5e49a1447e851f52e639838694a08e03159d8d76
parent e0dc40c0f232ee2d7c5523f307781ccd3f7cb50b
parent 71e737c8e8b970d780b930ebc6eacb4464d4a6aa

Merge "[ActivityManager] Fix race condition in pss collection" into lmp-mr1-dev

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 2c916da..475269e 100755
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -1669,7 +1669,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: {