diff options
| author | Jinsuk Kim <jinsukkim@google.com> | 2015-01-30 22:09:31 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-30 22:09:31 +0000 |
| commit | b70233d23a8ae3dfc10adfe1f046011ff09f7bb9 (patch) | |
| tree | 011afc0f8fb7fda4e869275c6efc2075d4e65c3a /services | |
| parent | 8df98bb8028573ecf856600482ac75281b6d9775 (diff) | |
| parent | 3457ae4709c8444f8ff9cdaf5809d6164f3bd21a (diff) | |
| download | frameworks_base-b70233d23a8ae3dfc10adfe1f046011ff09f7bb9.zip frameworks_base-b70233d23a8ae3dfc10adfe1f046011ff09f7bb9.tar.gz frameworks_base-b70233d23a8ae3dfc10adfe1f046011ff09f7bb9.tar.bz2 | |
am 3457ae47: Merge "Revert "CEC: Let playback device switch TV input after bootup"" into lmp-mr1-dev
* commit '3457ae4709c8444f8ff9cdaf5809d6164f3bd21a':
Revert "CEC: Let playback device switch TV input after bootup"
Diffstat (limited to 'services')
| -rw-r--r-- | services/core/java/com/android/server/hdmi/HdmiCecLocalDevicePlayback.java | 4 |
1 files changed, 0 insertions, 4 deletions
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 @@ 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 |