diff options
| author | Jinsuk Kim <jinsukkim@google.com> | 2014-03-24 21:25:21 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-24 21:25:21 +0000 |
| commit | 1c855178e497f7ba788dadb87167f1e6735d10cb (patch) | |
| tree | 4caeaf83440531acd9d265f0ccb7e085189b37c3 /core/java/android/content/Context.java | |
| parent | 76c30ce3c1d8f1a818502aaea2c42c84d6bd3f92 (diff) | |
| parent | 775a097f01a349548d2124ae9d7dd562c72eaa27 (diff) | |
| download | frameworks_base-1c855178e497f7ba788dadb87167f1e6735d10cb.zip frameworks_base-1c855178e497f7ba788dadb87167f1e6735d10cb.tar.gz frameworks_base-1c855178e497f7ba788dadb87167f1e6735d10cb.tar.bz2 | |
am 775a097f: am 3c34e5db: am c01e1aeb: Merge "Add HdmiCecManager" into klp-modular-dev
* commit '775a097f01a349548d2124ae9d7dd562c72eaa27':
Add HdmiCecManager
Diffstat (limited to 'core/java/android/content/Context.java')
| -rw-r--r-- | core/java/android/content/Context.java | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java index 134ffa9..9f0c384 100644 --- a/core/java/android/content/Context.java +++ b/core/java/android/content/Context.java @@ -2083,6 +2083,8 @@ public abstract class Context { * @see android.app.SearchManager * @see #SENSOR_SERVICE * @see android.hardware.SensorManager + * @see #HDMI_CEC_SERVICE + * @see android.hardware.hdmi.HdmiCecManager * @see #STORAGE_SERVICE * @see android.os.storage.StorageManager * @see #VIBRATOR_SERVICE @@ -2507,6 +2509,16 @@ public abstract class Context { /** * Use with {@link #getSystemService} to retrieve a + * {@link android.hardware.hdmi.HdmiCecManager for controlling and managing + * HDMI-CEC protocol. + * + * @see #getSystemService + * @see android.hardware.hdmi.HdmiCecManager + */ + public static final String HDMI_CEC_SERVICE = "hdmi_cec"; + + /** + * Use with {@link #getSystemService} to retrieve a * {@link android.hardware.input.InputManager} for interacting with input devices. * * @see #getSystemService |