commit 78cbb7a595338ed53e9eab42de48e2c3fb397838
author Dominic Lemire <dominic.lemire@broadcom.com> Thu Sep 19 10:00:17 2024 -0700
committer Dominic Lemire <dominic.lemire@broadcom.com> Thu Sep 19 10:02:13 2024 -0700
tree 5b16b807c5cb417d5278a575ec0c6ad3d3443638
parent ba62d4bac04f9e97c56a1ef006942bedf9217aec

CEC: invalidate physical address on getPhysicalAddress failure

Bug: 368084138
Test: manual (connect to a different HDMI port while in sleep)
Change-Id: Ie017bedfba053ed2ca263d4d13eec222be311119

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 5856ca9..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) {
+            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) {
+            synchronized (mLock) {
+                if (result == Result.SUCCESS) {
                     mPhysicalAddress = Short.toUnsignedInt(addr);
+                } else {
+                    mPhysicalAddress = INVALID_PHYSICAL_ADDRESS;
                 }
             }
         }