From 1fd30aa5581dec8cfa5113fe436bcd963d0a35f9 Mon Sep 17 00:00:00 2001
From: Jorim Jaggi <jjaggi@google.com>
Date: Thu, 23 Aug 2018 12:39:05 +0200
Subject: [PATCH] DO NOT MERGE Use correct lock when killing processes

Test: Switch display cutout
Bug: 113093654
Change-Id: I2ca076a214da86656b6c71ebe1f63eb92e340ac0
---
 .../core/java/com/android/server/am/ActivityManagerService.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
index 444ad8e2ced79..c5b8b950d4567 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