diff options
| author | 2018-08-23 12:39:05 +0200 | |
|---|---|---|
| committer | 2018-08-23 12:39:05 +0200 | |
| commit | 1fd30aa5581dec8cfa5113fe436bcd963d0a35f9 (patch) | |
| tree | 5b598aa2caba11603df70611b4ea0c68c0d3af68 | |
| parent | fcb7982a492413dd928433bfb73ae2ca1e222397 (diff) | |
DO NOT MERGE Use correct lock when killing processes
Test: Switch display cutout
Bug: 113093654
Change-Id: I2ca076a214da86656b6c71ebe1f63eb92e340ac0
| -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 |