summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2020-08-07 19:03:30 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2020-08-07 19:03:30 +0000
commitd93fd924b3789edbc4596179c0edd34b4f08ebe5 (patch)
tree20d0c768d858c0f835891dfc413e4bb944be2719
parentc158cf6dc6e30794a857902ede803c5c3c725d89 (diff)
parent7e14106a9d7a58a743438d97406cf1838c917b91 (diff)
Merge "Synchronize on the right lock in AccessibilityController"
-rw-r--r--services/core/java/com/android/server/wm/AccessibilityController.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/wm/AccessibilityController.java b/services/core/java/com/android/server/wm/AccessibilityController.java
index ecba3f9c27c4..1536473ff0a1 100644
--- a/services/core/java/com/android/server/wm/AccessibilityController.java
+++ b/services/core/java/com/android/server/wm/AccessibilityController.java
@@ -177,7 +177,7 @@ final class AccessibilityController {
public void performComputeChangedWindowsNotLocked(int displayId, boolean forceSend) {
WindowsForAccessibilityObserver observer = null;
- synchronized (mService) {
+ synchronized (mService.mGlobalLock) {
final WindowsForAccessibilityObserver windowsForA11yObserver =
mWindowsForAccessibilityObserver.get(displayId);
if (windowsForA11yObserver != null) {
@@ -266,7 +266,7 @@ final class AccessibilityController {
// Not relevant for the display magnifier.
WindowsForAccessibilityObserver observer = null;
- synchronized (mService) {
+ synchronized (mService.mGlobalLock) {
final WindowsForAccessibilityObserver windowsForA11yObserver =
mWindowsForAccessibilityObserver.get(displayId);
if (windowsForA11yObserver != null) {