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

* commit '877d89399af77a98dd940c034aa631029ed313cc':
  [ActivityManager] Fix race condition in pss collection
This commit is contained in:
Craig Mautner
2014-12-02 19:14:07 +00:00
committed by Android Git Automerger

View File

@@ -1660,7 +1660,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: {