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

Commit c772c1b3 authored by Riddle Hsu's avatar Riddle Hsu Committed by Automerger Merge Worker
Browse files

Merge "HdmiVideoExtconUEventObserver: handle "DP=1" state" into main am: f761d414 am: 1690f125 

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



Change-Id: Icde9f353685830d6edf0cdec13aee4fcb56163e9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 20e993fe 1690f125

services/core/java/com/android/server/policy/PhoneWindowManager.java

+3 −1
Original line number Original line Diff line number Diff line
@@ -6375,6 +6375,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { 




    private class HdmiVideoExtconUEventObserver extends ExtconStateObserver<Boolean> {

    private class HdmiVideoExtconUEventObserver extends ExtconStateObserver<Boolean> {

        private static final String HDMI_EXIST = "HDMI=1";

        private static final String HDMI_EXIST = "HDMI=1";

        private static final String DP_EXIST = "DP=1";

        private static final String NAME = "hdmi";

        private static final String NAME = "hdmi";





        private boolean init(ExtconInfo hdmi) {

        private boolean init(ExtconInfo hdmi) {
@@ -6405,7 +6406,8 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
        public Boolean parseState(ExtconInfo extconIfno, String state) {

        public Boolean parseState(ExtconInfo extconIfno, String state) {

            // extcon event state changes from kernel4.9

            // extcon event state changes from kernel4.9

            // new state will be like STATE=HDMI=1

            // new state will be like STATE=HDMI=1

            return state.contains(HDMI_EXIST);

            // or like STATE=DP=1 for newer kernel

            return state.contains(HDMI_EXIST) || state.contains(DP_EXIST);

        }

        }

    }

    }