summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorJinsuk Kim <jinsukkim@google.com>2014-05-29 06:52:45 +0900
committerJungshik Jang <jayjang@google.com>2014-06-02 11:01:45 +0900
commit48a0729d621d55b7b1d256106dbc9421b147ee89 (patch)
treef9d1819b3f821e3bfdaae29532914d50e65da093 /services
parente1e63c7c54b8a6a5d5d207bcedd08d2f8ac2465e (diff)
downloadframeworks_base-48a0729d621d55b7b1d256106dbc9421b147ee89.zip
frameworks_base-48a0729d621d55b7b1d256106dbc9421b147ee89.tar.gz
frameworks_base-48a0729d621d55b7b1d256106dbc9421b147ee89.tar.bz2
DO NOT MERGE: Do not reply with <Feature Abort> to CEC Broadcast message
Broadcast message is not targeted to a specific device but for announcement. Individual reponse with <Feature Abort> is neither necessary nor useful. Changed to send the message back only for direct messages. Change-Id: I927aa8e58a9868e158ed945c753492207e7c97f6
Diffstat (limited to 'services')
-rw-r--r--services/core/java/com/android/server/hdmi/HdmiCecController.java16
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) {