Merge "Fix deadlock issue."

This commit is contained in:
Treehugger Robot
2022-01-04 17:08:52 +00:00
committed by Gerrit Code Review

View File

@@ -913,7 +913,7 @@ public final class DisplayManagerGlobal {
private static final class DisplayListenerDelegate extends Handler {
public final DisplayListener mListener;
public long mEventsMask;
public volatile long mEventsMask;
private final DisplayInfo mDisplayInfo = new DisplayInfo();
@@ -933,12 +933,12 @@ public final class DisplayManagerGlobal {
removeCallbacksAndMessages(null);
}
public synchronized void setEventsMask(@EventsMask long newEventsMask) {
public void setEventsMask(@EventsMask long newEventsMask) {
mEventsMask = newEventsMask;
}
@Override
public synchronized void handleMessage(Message msg) {
public void handleMessage(Message msg) {
switch (msg.what) {
case EVENT_DISPLAY_ADDED:
if ((mEventsMask & DisplayManager.EVENT_FLAG_DISPLAY_ADDED) != 0) {