Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix deadlock issue." am: 6619bac824 am: cadcd9c225

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1918077

Change-Id: I1a1c9b2d437ea87c4eeecbd9ac5f2c1357cfcd17
This commit is contained in:
Treehugger Robot
2022-01-04 17:49:56 +00:00
committed by Automerger Merge Worker
parent 83fbe14648 cadcd9c225
commit acc96efcfa
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/hardware/display/DisplayManagerGlobal.java
View File

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