diff options
| author | Jungshik Jang <jayjang@google.com> | 2014-06-02 04:36:41 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-06-02 04:36:41 +0000 |
| commit | 9a4e0f12058545780fda59b904c56872f7bd1ca7 (patch) | |
| tree | c01b5be8d1c4a1c6ee51a4412f5681b05801c2dd | |
| parent | efc52b08c5266638fd2e9713d417f72e1cee0d92 (diff) | |
| parent | 48a0729d621d55b7b1d256106dbc9421b147ee89 (diff) | |
| download | frameworks_base-9a4e0f12058545780fda59b904c56872f7bd1ca7.zip frameworks_base-9a4e0f12058545780fda59b904c56872f7bd1ca7.tar.gz frameworks_base-9a4e0f12058545780fda59b904c56872f7bd1ca7.tar.bz2 | |
Merge "DO NOT MERGE: Do not reply with <Feature Abort> to CEC Broadcast message" into lmp-preview-dev
| -rw-r--r-- | services/core/java/com/android/server/hdmi/HdmiCecController.java | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/services/core/java/com/android/server/hdmi/HdmiCecController.java b/services/core/java/com/android/server/hdmi/HdmiCecController.java index 292f1cd..e0a01f0 100644 --- a/services/core/java/com/android/server/hdmi/HdmiCecController.java +++ b/services/core/java/com/android/server/hdmi/HdmiCecController.java @@ -499,14 +499,14 @@ final class HdmiCecController { return; } - // TODO: Use device's source address for broadcast message. - int sourceAddress = message.getDestination() != HdmiCec.ADDR_BROADCAST ? - message.getDestination() : 0; - // Reply <Feature Abort> to initiator (source) for all requests. - HdmiCecMessage cecMessage = HdmiCecMessageBuilder.buildFeatureAbortCommand - (sourceAddress, message.getSource(), message.getOpcode(), - HdmiCecMessageBuilder.ABORT_REFUSED); - sendCommand(cecMessage, null); + if (message.getDestination() != HdmiCec.ADDR_BROADCAST) { + int sourceAddress = message.getDestination(); + // Reply <Feature Abort> to initiator (source) for all requests. + HdmiCecMessage cecMessage = HdmiCecMessageBuilder.buildFeatureAbortCommand( + sourceAddress, message.getSource(), message.getOpcode(), + HdmiCecMessageBuilder.ABORT_REFUSED); + sendCommand(cecMessage, null); + } } void sendCommand(HdmiCecMessage cecMessage) { |