summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorJinsuk Kim <jinsukkim@google.com>2014-05-27 17:23:27 +0900
committerJungshik Jang <jayjang@google.com>2014-06-02 10:54:53 +0900
commit2c2a3017624678ee65d92feb51340f542a1d244c (patch)
tree2e58e6c2566e0c1ccb10ad06bf46dfbe69081501 /services
parent16e24a2d143345b2052ea7ccbe85fcda6d843608 (diff)
downloadframeworks_base-2c2a3017624678ee65d92feb51340f542a1d244c.zip
frameworks_base-2c2a3017624678ee65d92feb51340f542a1d244c.tar.gz
frameworks_base-2c2a3017624678ee65d92feb51340f542a1d244c.tar.bz2
DO NOT MERGE: Fix a bug using wrong addresses for CEC logical address allocation
Change-Id: I41da586c16dca4f325d147bb3abe5d4e09f7b91c
Diffstat (limited to 'services')
-rw-r--r--services/core/java/com/android/server/hdmi/HdmiCecController.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/hdmi/HdmiCecController.java b/services/core/java/com/android/server/hdmi/HdmiCecController.java
index 68ce607..3c18a59 100644
--- a/services/core/java/com/android/server/hdmi/HdmiCecController.java
+++ b/services/core/java/com/android/server/hdmi/HdmiCecController.java
@@ -196,7 +196,7 @@ final class HdmiCecController {
for (int i = 0; i < NUM_LOGICAL_ADDRESS; ++i) {
int curAddress = (startAddress + i) % NUM_LOGICAL_ADDRESS;
if (curAddress != HdmiCec.ADDR_UNREGISTERED
- && deviceType == HdmiCec.getTypeFromAddress(i)) {
+ && deviceType == HdmiCec.getTypeFromAddress(curAddress)) {
if (!sendPollMessage(curAddress, RETRY_COUNT_FOR_LOGICAL_ADDRESS_ALLOCATION)) {
logicalAddress = curAddress;
break;