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

Commit 3523a341 authored by Aaron Kling's avatar Aaron Kling Committed by Bruno Martins
Browse files

Revert "WiredAccessoryManager: Add support for DP audio" 

This reverts commit 6cc26342.

Reason for revert: Change breaks nvidia prebuilt audio

Change-Id: I60f171d7d01f0a8719461e5080c4eb6fa6e8ff04
parent 1d5af083

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

+0 −1
Original line number Diff line number Diff line
@@ -107,7 +107,6 @@ 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

+0 −4
Original line number Diff line number Diff line
@@ -738,7 +738,6 @@ 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,

            });
@@ -787,9 +786,6 @@ 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);

            }