summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorJinsuk Kim <jinsukkim@google.com>2015-01-23 16:35:47 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-01-23 16:35:47 +0000
commit2aec6d36d60fe858afe615f565c2997eb1095402 (patch)
tree38c458e66d10eadf53f8214d3017dd8e33497d34 /services
parent426b1bbc8c3762bb9a34bb12ab88f579789810d8 (diff)
parent7de1ed9d631ecabdf148e4e85bfc2f7f1698a77d (diff)
downloadframeworks_base-2aec6d36d60fe858afe615f565c2997eb1095402.zip
frameworks_base-2aec6d36d60fe858afe615f565c2997eb1095402.tar.gz
frameworks_base-2aec6d36d60fe858afe615f565c2997eb1095402.tar.bz2
am 7de1ed9d: Merge "CEC: Let playback device switch TV input after bootup" into lmp-mr1-dev
* commit '7de1ed9d631ecabdf148e4e85bfc2f7f1698a77d': CEC: Let playback device switch TV input after bootup
Diffstat (limited to 'services')
-rw-r--r--services/core/java/com/android/server/hdmi/HdmiCecLocalDevicePlayback.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/hdmi/HdmiCecLocalDevicePlayback.java b/services/core/java/com/android/server/hdmi/HdmiCecLocalDevicePlayback.java
index a8f6954..ce52920 100644
--- a/services/core/java/com/android/server/hdmi/HdmiCecLocalDevicePlayback.java
+++ b/services/core/java/com/android/server/hdmi/HdmiCecLocalDevicePlayback.java
@@ -55,6 +55,10 @@ final class HdmiCecLocalDevicePlayback extends HdmiCecLocalDevice {
mService.sendCecCommand(HdmiCecMessageBuilder.buildDeviceVendorIdCommand(
mAddress, mService.getVendorId()));
startQueuedActions();
+
+ // Switch TV input after bootup.
+ setActiveSource(true);
+ maySendActiveSource(Constants.ADDR_TV);
}
@Override