diff options
| author | Jungshik Jang <jayjang@google.com> | 2014-06-02 04:35:21 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-06-02 04:35:21 +0000 |
| commit | dc6adf5c62064213705820a520bd1415fd8670f3 (patch) | |
| tree | b6512c8eb9e36f36f585c589f7cc0e990abc62b2 | |
| parent | 15bbf99a52b684b8b6b876cf634d44b58b03c8ec (diff) | |
| parent | 2c2a3017624678ee65d92feb51340f542a1d244c (diff) | |
| download | frameworks_base-dc6adf5c62064213705820a520bd1415fd8670f3.zip frameworks_base-dc6adf5c62064213705820a520bd1415fd8670f3.tar.gz frameworks_base-dc6adf5c62064213705820a520bd1415fd8670f3.tar.bz2 | |
Merge "DO NOT MERGE: Fix a bug using wrong addresses for CEC logical address allocation" into lmp-preview-dev
| -rw-r--r-- | services/core/java/com/android/server/hdmi/HdmiCecController.java | 2 |
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; |