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

Commit 6619bac8 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Fix deadlock issue."

parents 302d0925 d2280b81

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

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