Merge "DO NOT MERGE Use correct lock when killing processes" into pi-dev

am: b4190776a7 Change-Id: I4d22467c3b5353e184dbd54cb64f7c880c3ef39b
2018-08-27 07:11:09 -07:00
parent cbac96ed79 b4190776a7
commit 104f588161
1 changed files with 1 additions and 1 deletions
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -26742,7 +26742,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