am f6be7d17: Merge "[ActivityManager] Fix race condition in pss collection"

* commit 'f6be7d177a740f86a4ae3b8685cc9e2f31506352': [ActivityManager] Fix race condition in pss collection
2014-12-02 19:05:01 +00:00
parent a370d9d19a f6be7d177a
commit 877d89399a
1 changed files with 3 additions and 1 deletions
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -1836,7 +1836,9 @@ public final class ActivityManagerService extends ActivityManagerNative
                break;
            }
            case REQUEST_ALL_PSS_MSG: {
-                requestPssAllProcsLocked(SystemClock.uptimeMillis(), true, false);
+                synchronized (ActivityManagerService.this) {
+                    requestPssAllProcsLocked(SystemClock.uptimeMillis(), true, false);
+                }
                break;
            }
            case START_PROFILES_MSG: {