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

2018-08-27 14:01:53 +00:00
parent 5b0074b434 1fd30aa558
commit b4190776a7
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
@@ -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