commit c988e15e1ff8e85981e7cd3347d759b37be1cf2f
author Jinsuk Kim <jinsukkim@google.com> Thu Jan 22 02:21:59 2015 +0000
committer android-build-merger <android-build-merger@google.com> Thu Jan 22 02:21:59 2015 +0000
tree 4b9ba0bee060238c1fa075200476ebd6903f1416
parent 67add1d26257eb298918a6e2c75f21afd59dadba
parent 7de1ed9d631ecabdf148e4e85bfc2f7f1698a77d

Merge "CEC: Let playback device switch TV input after bootup" into lmp-mr1-dev
automerge: 7de1ed9

* commit '7de1ed9d631ecabdf148e4e85bfc2f7f1698a77d':
  CEC: Let playback device switch TV input after bootup

services/core/java/com/android/server/hdmi/HdmiCecLocalDevicePlayback.java

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 @@
         mService.sendCecCommand(HdmiCecMessageBuilder.buildDeviceVendorIdCommand(
                 mAddress, mService.getVendorId()));
         startQueuedActions();
+
+        // Switch TV input after bootup.
+        setActiveSource(true);
+        maySendActiveSource(Constants.ADDR_TV);
     }
 
     @Override