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 am: acc96efcfa

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

Change-Id: Icb20857776295337f74496b85fa1dc9a36f8e537
This commit is contained in:
Treehugger Robot
2022-01-04 18:12:45 +00:00
committed by Automerger Merge Worker
parent 52ed9c533b acc96efcfa
commit efcdf5b5a4
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

@@ -941,7 +941,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();
@@ -961,12 +961,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) {