commit 7bc0929905fa5964a6f9a5b0b059153dc8cdd69d
author Jinsuk Kim <jinsukkim@google.com> Fri Jan 30 22:15:00 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Jan 30 22:15:00 2015 +0000
tree a4748b36db30506b11dfcc5364f6640d81f31338
parent b5083a7d54f839db779a1fa60adc3ac5dbf70e79
parent 42e785fbf7dfa50096275cf1e6233247e9fc15f7

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

* commit '42e785fbf7dfa50096275cf1e6233247e9fc15f7':
  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