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

Commit bc4ca1c7 authored by /e/ robot's avatar /e/ robot
Browse files

Merge remote-tracking branch 'origin/lineage-20.0' into v1-t

parents 36fcf688 6cc26342

services/core/java/com/android/server/ExtconUEventObserver.java

+1 −0
Original line number Diff line number Diff line
@@ -107,6 +107,7 @@ public abstract class ExtconUEventObserver extends UEventObserver { 
        public static final String EXTCON_MICROPHONE = "MICROPHONE";

        public static final String EXTCON_HEADPHONE = "HEADPHONE";



        public static final String EXTCON_DP = "DP";

        public static final String EXTCON_HDMI = "HDMI";

        public static final String EXTCON_MHL = "MHL";

        public static final String EXTCON_DVI = "DVI";

services/core/java/com/android/server/WiredAccessoryManager.java

+4 −0
Original line number Diff line number Diff line
@@ -738,6 +738,7 @@ final class WiredAccessoryManager implements WiredAccessoryCallbacks { 
            mExtconInfos = ExtconInfo.getExtconInfoForTypes(new String[] {

                    ExtconInfo.EXTCON_HEADPHONE,

                    ExtconInfo.EXTCON_MICROPHONE,

                    ExtconInfo.EXTCON_DP,

                    ExtconInfo.EXTCON_HDMI,

                    ExtconInfo.EXTCON_LINE_OUT,

            });
@@ -786,6 +787,9 @@ final class WiredAccessoryManager implements WiredAccessoryCallbacks { 
            if (extconInfo.hasCableType(ExtconInfo.EXTCON_HDMI)) {

                updateBit(maskAndState, BIT_HDMI_AUDIO, status, ExtconInfo.EXTCON_HDMI);

            }

            if (extconInfo.hasCableType(ExtconInfo.EXTCON_DP)) {

                updateBit(maskAndState, BIT_HDMI_AUDIO, status, ExtconInfo.EXTCON_DP);

            }

            if (extconInfo.hasCableType(ExtconInfo.EXTCON_LINE_OUT)) {

                updateBit(maskAndState, BIT_LINEOUT, status, ExtconInfo.EXTCON_LINE_OUT);

            }