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

Commit 40490e83 authored by Nathalie Le Clair's avatar Nathalie Le Clair Committed by Android (Google) Code Review
Browse files

Merge "Update HAL API names"

parents c09d5342 cf80a53f

services/core/java/com/android/server/hdmi/Constants.java

+4 −4
Original line number Diff line number Diff line
@@ -601,12 +601,12 @@ final class Constants { 
    })

    @interface RcProfileSource {}



    static final int HDMI_EARC_STATUS_IDLE = IEArcStatus.STATUS_IDLE; // IDLE1

    static final int HDMI_EARC_STATUS_IDLE = IEArcStatus.IDLE; // IDLE1

    static final int HDMI_EARC_STATUS_EARC_PENDING =

            IEArcStatus.STATUS_EARC_PENDING; // DISC1 and DISC2

    static final int HDMI_EARC_STATUS_ARC_PENDING = IEArcStatus.STATUS_ARC_PENDING; // IDLE2 for ARC

            IEArcStatus.EARC_PENDING; // DISC1 and DISC2

    static final int HDMI_EARC_STATUS_ARC_PENDING = IEArcStatus.ARC_PENDING; // IDLE2 for ARC

    static final int HDMI_EARC_STATUS_EARC_CONNECTED =

            IEArcStatus.STATUS_EARC_CONNECTED; // eARC connected

            IEArcStatus.EARC_CONNECTED; // eARC connected



    @IntDef({

            HDMI_EARC_STATUS_IDLE,

services/tests/servicestests/src/com/android/server/hdmi/FakeEArcNativeWrapper.java

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ final class FakeEArcNativeWrapper implements HdmiEarcController.EArcNativeWrappe 


    @Override

    public byte nativeGetState(int portId) {

        return IEArcStatus.STATUS_IDLE;

        return IEArcStatus.IDLE;

    }



    @Override