diff options
| author | 2024-09-20 00:57:27 +0000 | |
|---|---|---|
| committer | 2024-09-20 00:57:27 +0000 | |
| commit | 1d3f84d5485b6c26e829540416119bbcee3b69b8 (patch) | |
| tree | 28f6c3b28f67879fbc7c6c0299d595497b5ba1b1 | |
| parent | dc9932a22a062d55e09af06cc0a5f3391d904490 (diff) | |
| parent | f1492cdf149872b881a6379e9a67356e6cef79a0 (diff) | |
Merge changes Ie017bedf,If29d58fa into main am: 850c53840b am: f1492cdf14
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3271869
Change-Id: Idd0c0cc1cec67df6c1d887e4ee715727445d1286
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | services/core/java/com/android/server/hdmi/HdmiCecController.java | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/services/core/java/com/android/server/hdmi/HdmiCecController.java b/services/core/java/com/android/server/hdmi/HdmiCecController.java index 5696fbaf3679..f2e2f653f929 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 @@ final class HdmiCecController { @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 @@ final class HdmiCecController { @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; } } } |