diff options
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2024-05-02 23:59:52 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-05-02 23:59:52 +0000 |
| commit | 8b70a2c62d33babd03848326e86a1cc719fa00ea (patch) | |
| tree | 87a6dfab3221548598d0be8cc165e19d201f75b0 | |
| parent | e343d44ca805f9713949ed51f2edfd134ac9a9cc (diff) | |
| parent | ebf4bdac942e9bea0b89f00f7b0c281fc8c048ce (diff) | |
| download | base-8b70a2c62d33babd03848326e86a1cc719fa00ea.tar.gz | |
Merge "CEC: correct frameworks physicalAddress parsing" into main
| -rw-r--r-- | services/core/java/com/android/server/hdmi/HdmiCecController.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/services/core/java/com/android/server/hdmi/HdmiCecController.java b/services/core/java/com/android/server/hdmi/HdmiCecController.java index 9087354dee40..3f89f236dfc3 100644 --- a/services/core/java/com/android/server/hdmi/HdmiCecController.java +++ b/services/core/java/com/android/server/hdmi/HdmiCecController.java @@ -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) |