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

Commit 6b25278e authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "HDMI: Add new field eArcSupported" am: 45661bec am: 0c8f94b4 

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2280731



Change-Id: Icab5c7b5ccdf02e15e00e51595f9ea60d78f69c8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2cb9940f 0c8f94b4

tv/hdmi/aidl/aidl_api/android.hardware.tv.hdmi/current/android/hardware/tv/hdmi/HdmiPortInfo.aidl

+1 −0
Original line number Original line Diff line number Diff line
@@ -38,5 +38,6 @@ parcelable HdmiPortInfo { 
  int portId;

  int portId;

  boolean cecSupported;

  boolean cecSupported;

  boolean arcSupported;

  boolean arcSupported;

  boolean eArcSupported;

  int physicalAddress;

  int physicalAddress;

}
 
}

tv/hdmi/aidl/android/hardware/tv/hdmi/HdmiPortInfo.aidl

+1 −0
Original line number Original line Diff line number Diff line
@@ -27,6 +27,7 @@ parcelable HdmiPortInfo { 
    int portId; // Should start from 1 which corresponds to HDMI "port 1".

    int portId; // Should start from 1 which corresponds to HDMI "port 1".

    boolean cecSupported;

    boolean cecSupported;

    boolean arcSupported;

    boolean arcSupported;

    boolean eArcSupported;

    // The physical address of the device connected to this port, valid range is 0x0000 to 0xFFFF

    // The physical address of the device connected to this port, valid range is 0x0000 to 0xFFFF

    // (ref Sec 8.7.2 of HDMI 1.4b).

    // (ref Sec 8.7.2 of HDMI 1.4b).

    int physicalAddress;

    int physicalAddress;

tv/hdmi/aidl/default/HdmiMock.cpp

+1 −0
Original line number Original line Diff line number Diff line
@@ -166,6 +166,7 @@ HdmiMock::HdmiMock() { 
                     .portId = static_cast<uint32_t>(1),

                     .portId = static_cast<uint32_t>(1),

                     .cecSupported = true,

                     .cecSupported = true,

                     .arcSupported = false,

                     .arcSupported = false,

                     .eArcSupported = false,

                     .physicalAddress = mPhysicalAddress};

                     .physicalAddress = mPhysicalAddress};

    mPortConnectionStatus[0] = false;

    mPortConnectionStatus[0] = false;

    mDeathRecipient = ndk::ScopedAIBinder_DeathRecipient(AIBinder_DeathRecipient_new(serviceDied));

    mDeathRecipient = ndk::ScopedAIBinder_DeathRecipient(AIBinder_DeathRecipient_new(serviceDied));