summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorJinsuk Kim <jinsukkim@google.com>2014-10-06 23:48:19 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-10-06 23:48:20 +0000
commit84659edd41b0bc7ecde645405e926a641e704824 (patch)
tree94ed386b55541baec4405164ca41396bbfdafc51 /services
parenta6b027084cdeefcd431a4e6b46c1718ed3dfb874 (diff)
parentad515e88ee53ef0849b2e749efd87f7587514769 (diff)
downloadframeworks_base-84659edd41b0bc7ecde645405e926a641e704824.zip
frameworks_base-84659edd41b0bc7ecde645405e926a641e704824.tar.gz
frameworks_base-84659edd41b0bc7ecde645405e926a641e704824.tar.bz2
Merge "CEC: Send <Device Vendor ID> after address allocation" into lmp-mr1-dev
Diffstat (limited to 'services')
-rw-r--r--services/core/java/com/android/server/hdmi/HdmiCecLocalDevicePlayback.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/hdmi/HdmiCecLocalDevicePlayback.java b/services/core/java/com/android/server/hdmi/HdmiCecLocalDevicePlayback.java
index e8ab673..779acbe 100644
--- a/services/core/java/com/android/server/hdmi/HdmiCecLocalDevicePlayback.java
+++ b/services/core/java/com/android/server/hdmi/HdmiCecLocalDevicePlayback.java
@@ -44,6 +44,8 @@ final class HdmiCecLocalDevicePlayback extends HdmiCecLocalDevice {
assertRunOnServiceThread();
mService.sendCecCommand(HdmiCecMessageBuilder.buildReportPhysicalAddressCommand(
mAddress, mService.getPhysicalAddress(), mDeviceType));
+ mService.sendCecCommand(HdmiCecMessageBuilder.buildDeviceVendorIdCommand(
+ mAddress, mService.getVendorId()));
if (reason == HdmiControlService.INITIATED_BY_SCREEN_ON) {
oneTouchPlay(new IHdmiControlCallback.Stub() {
@Override public void onComplete(int result) throws RemoteException {}
@@ -228,4 +230,4 @@ final class HdmiCecLocalDevicePlayback extends HdmiCecLocalDevice {
super.dump(pw);
pw.println("mIsActiveSource: " + mIsActiveSource);
}
-} \ No newline at end of file
+}