commit 850c53840b8e3a12e3fa815d6afcc07ea0c6e625
author Paul Colta <donpaul@google.com> Fri Sep 20 00:02:02 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Sep 20 00:02:02 2024 +0000
tree 2731f04631aaf934cdeba6ac53e3ffd05921ae91
parent 2a1dfb1214f71ac572a7ccb6a9cd2a65dee1e61c
parent 78cbb7a595338ed53e9eab42de48e2c3fb397838

Merge changes Ie017bedf,If29d58fa into main

* changes:
  CEC: invalidate physical address on getPhysicalAddress failure
  CEC: avoid sign-extending physical addresses

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

diff --git a/services/core/java/com/android/server/hdmi/HdmiCecController.java b/services/core/java/com/android/server/hdmi/HdmiCecController.java
index cd2c037..339a062 100644
--- a/services/core/java/com/android/server/hdmi/HdmiCecController.java
+++ b/services/core/java/com/android/server/hdmi/HdmiCecController.java
@@ -1207,9 +1207,11 @@
 
         @Override
         public void onValues(int result, short addr) {
-            if (result == Result.SUCCESS) {
-                synchronized (mLock) {
-                    mPhysicalAddress = new Short(addr).intValue();
+            synchronized (mLock) {
+                if (result == Result.SUCCESS) {
+                    mPhysicalAddress = Short.toUnsignedInt(addr);
+                } else {
+                    mPhysicalAddress = INVALID_PHYSICAL_ADDRESS;
                 }
             }
         }
@@ -1605,9 +1607,11 @@
 
         @Override
         public void onValues(int result, short addr) {
-            if (result == Result.SUCCESS) {
-                synchronized (mLock) {
-                    mPhysicalAddress = new Short(addr).intValue();
+            synchronized (mLock) {
+                if (result == Result.SUCCESS) {
+                    mPhysicalAddress = Short.toUnsignedInt(addr);
+                } else {
+                    mPhysicalAddress = INVALID_PHYSICAL_ADDRESS;
                 }
             }
         }