diff options
| author | Jungshik Jang <jayjang@google.com> | 2014-07-21 06:13:07 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-07-17 21:11:29 +0000 |
| commit | 189bff29e6f5cba13d5cfe2c27a3c9dbc795e105 (patch) | |
| tree | fbeb3334c6293d477c56335b68d11125ec076a3e /services | |
| parent | 75df3bf9789de68fba88f8faa44b7c0e9b44aafe (diff) | |
| parent | 1827fdcbf6a53378f05620790e4798201341097b (diff) | |
| download | frameworks_base-189bff29e6f5cba13d5cfe2c27a3c9dbc795e105.zip frameworks_base-189bff29e6f5cba13d5cfe2c27a3c9dbc795e105.tar.gz frameworks_base-189bff29e6f5cba13d5cfe2c27a3c9dbc795e105.tar.bz2 | |
Merge "Do no send <Feature Abort> as response of <Feature Abort>" into lmp-dev
Diffstat (limited to 'services')
| -rw-r--r-- | services/core/java/com/android/server/hdmi/HdmiCecController.java | 21 |
1 files changed, 13 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 72519f2..cbccc1d 100644 --- a/services/core/java/com/android/server/hdmi/HdmiCecController.java +++ b/services/core/java/com/android/server/hdmi/HdmiCecController.java @@ -506,15 +506,20 @@ final class HdmiCecController { && mService.handleCecCommand(message)) { return; } - - if (message.getDestination() != Constants.ADDR_BROADCAST) { - int sourceAddress = message.getDestination(); - // Reply <Feature Abort> to initiator (source) for all requests. - HdmiCecMessage cecMessage = HdmiCecMessageBuilder.buildFeatureAbortCommand( - sourceAddress, message.getSource(), message.getOpcode(), - Constants.ABORT_REFUSED); - sendCommand(cecMessage); + if (message.getDestination() == Constants.ADDR_BROADCAST) { + return; } + if (message.getOpcode() == Constants.MESSAGE_FEATURE_ABORT) { + Slog.v(TAG, "Unhandled <Feature Abort> message:" + message); + return; + } + + int sourceAddress = message.getDestination(); + // Reply <Feature Abort> to initiator (source) for all requests. + HdmiCecMessage cecMessage = HdmiCecMessageBuilder.buildFeatureAbortCommand( + sourceAddress, message.getSource(), message.getOpcode(), + Constants.ABORT_REFUSED); + sendCommand(cecMessage); } @ServiceThreadOnly |