Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit efcdf5b5 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix deadlock issue." am: 6619bac8 am: cadcd9c2 am: acc96efc 

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

Change-Id: Icb20857776295337f74496b85fa1dc9a36f8e537
parents 52ed9c53 acc96efc

core/java/android/hardware/display/DisplayManagerGlobal.java

+3 −3
Original line number Diff line number Diff line
@@ -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) {