diff options
| author | 2014-06-03 04:14:47 +0000 | |
|---|---|---|
| committer | 2014-06-03 04:14:49 +0000 | |
| commit | c3e9b45da09b8689df1d6d474c68e9db37e948ab (patch) | |
| tree | 4fe19877c5613c52e08bc5d5e087c5359ab95d44 | |
| parent | faa3ff9ba89486aad83eab0526aea46ea7bbcfe6 (diff) | |
| parent | b9e60f35ef836e77388b571469972ff1a43c8695 (diff) | |
Merge "DO NOT MERGE: Added missing entries in the cec device array" into lmp-preview-dev
| -rw-r--r-- | core/java/android/hardware/hdmi/HdmiCec.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/core/java/android/hardware/hdmi/HdmiCec.java b/core/java/android/hardware/hdmi/HdmiCec.java index a71a74dbef5a..723eda1fd4a6 100644 --- a/core/java/android/hardware/hdmi/HdmiCec.java +++ b/core/java/android/hardware/hdmi/HdmiCec.java @@ -194,6 +194,8 @@ public final class HdmiCec { DEVICE_RECORDER, // ADDR_RECORDER_3 DEVICE_TUNER, // ADDR_TUNER_4 DEVICE_PLAYBACK, // ADDR_PLAYBACK_3 + DEVICE_RESERVED, + DEVICE_RESERVED, DEVICE_TV, // ADDR_SPECIFIC_USE }; @@ -210,6 +212,8 @@ public final class HdmiCec { "Recorder_3", "Tuner_4", "Playback_3", + "Reserved_1", + "Reserved_2", "Secondary_TV", }; |