diff options
| author | Jungshik Jang <jayjang@google.com> | 2014-06-02 04:35:57 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-06-02 04:35:58 +0000 |
| commit | 9bb6fbb743a29341f6da4b573812798c7efedf35 (patch) | |
| tree | ee70f844edf3fc54b3b4a4146de1ad5a33976dd3 | |
| parent | 1dcef4f9cda5d8bc4cdbf5f27fda02ce03871d79 (diff) | |
| parent | a8fd44b74b8822426cdc0e45351899c95bf30e16 (diff) | |
| download | frameworks_base-9bb6fbb743a29341f6da4b573812798c7efedf35.zip frameworks_base-9bb6fbb743a29341f6da4b573812798c7efedf35.tar.gz frameworks_base-9bb6fbb743a29341f6da4b573812798c7efedf35.tar.bz2 | |
Merge "DO NOT MERGE: Fix a couple of bugs in CEC services" into lmp-preview-dev
| -rw-r--r-- | core/java/android/hardware/hdmi/HdmiCecMessage.java | 2 | ||||
| -rw-r--r-- | services/core/java/com/android/server/hdmi/FeatureAction.java | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/core/java/android/hardware/hdmi/HdmiCecMessage.java b/core/java/android/hardware/hdmi/HdmiCecMessage.java index a8aa376..62fa279 100644 --- a/core/java/android/hardware/hdmi/HdmiCecMessage.java +++ b/core/java/android/hardware/hdmi/HdmiCecMessage.java @@ -46,7 +46,7 @@ public final class HdmiCecMessage implements Parcelable { public HdmiCecMessage(int source, int destination, int opcode, byte[] params) { mSource = source; mDestination = destination; - mOpcode = opcode; + mOpcode = opcode & 0xFF; mParams = Arrays.copyOf(params, params.length); } diff --git a/services/core/java/com/android/server/hdmi/FeatureAction.java b/services/core/java/com/android/server/hdmi/FeatureAction.java index f8e9b7b..0ba7773 100644 --- a/services/core/java/com/android/server/hdmi/FeatureAction.java +++ b/services/core/java/com/android/server/hdmi/FeatureAction.java @@ -133,7 +133,8 @@ abstract class FeatureAction { @Override public void sendTimerMessage(int state, long delayMillis) { - sendMessageDelayed(obtainMessage(MSG_TIMEOUT, state), delayMillis); + // The third argument(0) is not used. + sendMessageDelayed(obtainMessage(MSG_TIMEOUT, state, 0), delayMillis); } @Override |