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

Commit 8b70a2c6 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "CEC: correct frameworks physicalAddress parsing" into main

parents e343d44c ebf4bdac

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

+3 −3
Original line number Diff line number Diff line
@@ -347,7 +347,7 @@ final class HdmiCecController { 
     * {@link HdmiCecNetwork} only.

     *

     * @return CEC physical address of the device. The range of success address

     *         is between 0x0000 and 0xFFFF. If failed it returns -1

     *         is between 0x0000 and 0xFFFE. If failed it returns INVALID_PHYSICAL_ADDRESS.

     */

    @ServiceThreadOnly

    int getPhysicalAddress() {
@@ -1299,7 +1299,7 @@ final class HdmiCecController { 
                    hdmiPortInfo[i] = new HdmiPortInfo.Builder(

                            portInfo.portId,

                            portInfo.type,

                            portInfo.physicalAddress)

                            Short.toUnsignedInt(portInfo.physicalAddress))

                            .setCecSupported(portInfo.cecSupported)

                            .setMhlSupported(false)

                            .setArcSupported(portInfo.arcSupported)
@@ -1496,7 +1496,7 @@ final class HdmiCecController { 
                    hdmiPortInfo[i] = new HdmiPortInfo.Builder(

                            portInfo.portId,

                            portInfo.type,

                            portInfo.physicalAddress)

                            Short.toUnsignedInt(portInfo.physicalAddress))

                            .setCecSupported(portInfo.cecSupported)

                            .setMhlSupported(false)

                            .setArcSupported(portInfo.arcSupported)