summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jinsuk Kim <jinsukkim@google.com> 2014-06-16 22:24:10 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2014-06-10 22:31:57 +0000
commitca515e307e10d00dacdd9b51d2f0118f7eff18e1 (patch)
tree9636285a9071a239de1fda4189e3014cc2fc7741
parentb8d5f476ffe192d84e33652fc87a14049dd18ffa (diff)
parent0d3985a977886a0d6d6bb7ba6d048c1e21b05a24 (diff)
Merge "Added an argument isPressed to HdmiControlService#sendKeyEvent"
-rw-r--r--core/java/android/hardware/hdmi/IHdmiControlService.aidl2
-rw-r--r--services/core/java/com/android/server/hdmi/HdmiControlService.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/hardware/hdmi/IHdmiControlService.aidl b/core/java/android/hardware/hdmi/IHdmiControlService.aidl
index a0bf5527e228..559a469e5269 100644
--- a/core/java/android/hardware/hdmi/IHdmiControlService.aidl
+++ b/core/java/android/hardware/hdmi/IHdmiControlService.aidl
@@ -40,6 +40,6 @@ interface IHdmiControlService {
void addDeviceEventListener(IHdmiDeviceEventListener listener);
void deviceSelect(int logicalAddress, IHdmiControlCallback callback);
void portSelect(int portId, IHdmiControlCallback callback);
- void sendKeyEvent(int keyCode);
+ void sendKeyEvent(int keyCode, boolean isPressed);
List<HdmiPortInfo> getPortInfo();
}
diff --git a/services/core/java/com/android/server/hdmi/HdmiControlService.java b/services/core/java/com/android/server/hdmi/HdmiControlService.java
index 5fffada46045..eb356e920f88 100644
--- a/services/core/java/com/android/server/hdmi/HdmiControlService.java
+++ b/services/core/java/com/android/server/hdmi/HdmiControlService.java
@@ -897,7 +897,7 @@ public final class HdmiControlService extends SystemService {
}
@Override
- public void sendKeyEvent(int keyCode) {
+ public void sendKeyEvent(int keyCode, boolean isPressed) {
// TODO: Implement this
}