summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorJinsuk Kim <jinsukkim@google.com>2014-04-11 09:43:37 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-04-11 09:43:37 +0000
commit4bdcd299da48f9abe5f9c67abed0dbe79080445d (patch)
tree825c62151294312a3165951ffbd88fd8c2708b9b /core
parentb429088cbb12a226fd217f04870d16bbd833ed06 (diff)
parent55dab4dd3b5b56ade91c012d688b581b6cbdebdf (diff)
downloadframeworks_base-4bdcd299da48f9abe5f9c67abed0dbe79080445d.zip
frameworks_base-4bdcd299da48f9abe5f9c67abed0dbe79080445d.tar.gz
frameworks_base-4bdcd299da48f9abe5f9c67abed0dbe79080445d.tar.bz2
am 55dab4dd: am b11f250e: Merge "Delegate HdmiCecService method impl to HdmiCecDevice subclass" into klp-modular-dev
* commit '55dab4dd3b5b56ade91c012d688b581b6cbdebdf': Delegate HdmiCecService method impl to HdmiCecDevice subclass
Diffstat (limited to 'core')
-rw-r--r--core/java/android/hardware/hdmi/HdmiCecClient.java18
-rw-r--r--core/java/android/hardware/hdmi/IHdmiCecService.aidl1
2 files changed, 17 insertions, 2 deletions
diff --git a/core/java/android/hardware/hdmi/HdmiCecClient.java b/core/java/android/hardware/hdmi/HdmiCecClient.java
index 1f382e6..cd86cd8 100644
--- a/core/java/android/hardware/hdmi/HdmiCecClient.java
+++ b/core/java/android/hardware/hdmi/HdmiCecClient.java
@@ -88,7 +88,7 @@ public final class HdmiCecClient {
}
/**
- * Send &lt;TextViewOn&gt; message.
+ * Send &lt;Text View On&gt; message.
*/
public void sendTextViewOn() {
try {
@@ -99,7 +99,7 @@ public final class HdmiCecClient {
}
/**
- * Send &lt;ImageViewOn&gt; message.
+ * Send &lt;Image View On&gt; message.
*/
public void sendImageViewOn() {
try {
@@ -110,6 +110,20 @@ public final class HdmiCecClient {
}
/**
+ * Send &lt;Give Device Power Status&gt; message.
+ *
+ * @param address logical address of the device to send the message to, such as
+ * {@link HdmiCec#ADDR_TV}.
+ */
+ public void sendGiveDevicePowerStatus(int address) {
+ try {
+ mService.sendGiveDevicePowerStatus(mBinder, address);
+ } catch (RemoteException e) {
+ Log.e(TAG, "sendGiveDevicePowerStatus threw exception ", e);
+ }
+ }
+
+ /**
* Returns true if the TV or attached display is powered on.
* <p>
* The result of this method is only meaningful on playback devices (where the device
diff --git a/core/java/android/hardware/hdmi/IHdmiCecService.aidl b/core/java/android/hardware/hdmi/IHdmiCecService.aidl
index b5df131..ecdd345 100644
--- a/core/java/android/hardware/hdmi/IHdmiCecService.aidl
+++ b/core/java/android/hardware/hdmi/IHdmiCecService.aidl
@@ -33,6 +33,7 @@ interface IHdmiCecService {
void sendInactiveSource(IBinder b);
void sendImageViewOn(IBinder b);
void sendTextViewOn(IBinder b);
+ void sendGiveDevicePowerStatus(IBinder b, int address);
boolean isTvOn(IBinder b);
void sendMessage(IBinder b, in HdmiCecMessage message);
}