diff options
| author | Jungshik Jang <jayjang@google.com> | 2014-08-25 15:37:20 +0900 |
|---|---|---|
| committer | Jungshik Jang <jayjang@google.com> | 2014-08-26 14:13:57 +0900 |
| commit | 339227da7cf025ce4ae0c85ddc52643d63972321 (patch) | |
| tree | 2e549ca941b95a21fdd4ddcb0a97043808963d42 /core/java/android | |
| parent | 93b18bda1bf3a2d4c48b9f648ed00083c2cabfca (diff) | |
| download | frameworks_base-339227da7cf025ce4ae0c85ddc52643d63972321.zip frameworks_base-339227da7cf025ce4ae0c85ddc52643d63972321.tar.gz frameworks_base-339227da7cf025ce4ae0c85ddc52643d63972321.tar.bz2 | |
Fix several bugs in HdmiControlService.
1. Fix HdmniLogger null pointer exception
2. Should check arc enabled port for arc requests
3. Disallow ARC action coming from indirect AVR device.
4. Check original opcode of feature action
5. Add bitmasking to all parameters of cec message.
Bug: 17243701, Bug: 17238394, Bug: 17241401
Change-Id: Iff0da78b0de9a29fb00e683c261528e0baea66af
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/hardware/hdmi/HdmiControlManager.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/core/java/android/hardware/hdmi/HdmiControlManager.java b/core/java/android/hardware/hdmi/HdmiControlManager.java index 3c61e39..4b5ced9 100644 --- a/core/java/android/hardware/hdmi/HdmiControlManager.java +++ b/core/java/android/hardware/hdmi/HdmiControlManager.java @@ -48,6 +48,12 @@ public final class HdmiControlManager { @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION) public static final String ACTION_OSD_MESSAGE = "android.hardware.hdmi.action.OSD_MESSAGE"; + // --- Messages for ACTION_OSD_MESSAGE --- + /** + * Message that ARC enabled device is connected to invalid port (non-ARC port). + */ + public static final int OSD_MESSAGE_ARC_CONNECTED_INVALID_PORT = 1; + /** * Used as an extra field in the intent {@link #ACTION_OSD_MESSAGE}. Contains the ID of * the message to display on screen. |