commit 266fd264dbeb2c2667adf1f1ca41861b5b9f889a
author Jinsuk Kim <jinsukkim@google.com> Fri Jan 30 22:16:46 2015 +0000
committer android-build-merger <android-build-merger@google.com> Fri Jan 30 22:16:46 2015 +0000
tree dede144b48b4db404f3188575fb2fba22fad71a7
parent bd39d50624ae702009ff6e7e15885de479a52800
parent 7bc0929905fa5964a6f9a5b0b059153dc8cdd69d

am 42e785fb: am 3457ae47: Merge "Revert "CEC: Let playback device switch TV input after bootup"" into lmp-mr1-dev
automerge: 7bc0929

* commit '7bc0929905fa5964a6f9a5b0b059153dc8cdd69d':
  Revert "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 ce52920..a8f6954 100644
--- a/services/core/java/com/android/server/hdmi/HdmiCecLocalDevicePlayback.java
+++ b/services/core/java/com/android/server/hdmi/HdmiCecLocalDevicePlayback.java
@@ -55,10 +55,6 @@
         mService.sendCecCommand(HdmiCecMessageBuilder.buildDeviceVendorIdCommand(
                 mAddress, mService.getVendorId()));
         startQueuedActions();
-
-        // Switch TV input after bootup.
-        setActiveSource(true);
-        maySendActiveSource(Constants.ADDR_TV);
     }
 
     @Override