diff options
| author | Craig Mautner <cmautner@google.com> | 2014-12-02 18:57:34 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-12-02 18:57:36 +0000 |
| commit | f6be7d177a740f86a4ae3b8685cc9e2f31506352 (patch) | |
| tree | bb2579730340cf12bb32c3fa793576f21809ffe8 | |
| parent | f54954f97599f83584ab736d931b1fe1aff8890c (diff) | |
| parent | 62cfde14423922948928c40eddd212d1dc51d591 (diff) | |
| download | base-f6be7d177a740f86a4ae3b8685cc9e2f31506352.tar.gz | |
Merge "[ActivityManager] Fix race condition in pss collection"
| -rwxr-xr-x | services/core/java/com/android/server/am/ActivityManagerService.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index d2ee4fe4c0b3..4cbf019e801b 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 @@ 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: { |