diff options
| author | Jorim Jaggi <jjaggi@google.com> | 2018-08-23 12:39:05 +0200 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2018-08-24 22:57:24 +0000 |
| commit | 7df76c43d8f92254f0a189c90f4bc1ffd38e54ca (patch) | |
| tree | d29f2c52e928b1ee85e59eeea9fdf41c777c12ee | |
| parent | 1c360feda14448ec54d2e600e01e9c1468b1a654 (diff) | |
| download | base-7df76c43d8f92254f0a189c90f4bc1ffd38e54ca.tar.gz | |
DO NOT MERGE Use correct lock when killing processes
Test: Switch display cutout
Bug: 113093654
Change-Id: I2ca076a214da86656b6c71ebe1f63eb92e340ac0
(cherry picked from commit 1fd30aa5581dec8cfa5113fe436bcd963d0a35f9)
| -rw-r--r-- | services/core/java/com/android/server/am/ActivityManagerService.java | 2 |
1 files changed, 1 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 444ad8e2ced7..c5b8b950d456 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -26873,7 +26873,7 @@ public class ActivityManagerService extends IActivityManager.Stub @Override public void notifyDefaultDisplaySizeChanged() { - synchronized (this) { + synchronized (ActivityManagerService.this) { if (mSystemServiceManager.isBootCompleted() && mHomeProcess != null) { // TODO: Ugly hack to unblock the release |