diff options
| author | Jinsuk Kim <jinsukkim@google.com> | 2015-01-30 22:00:39 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-01-30 22:00:40 +0000 |
| commit | 3457ae4709c8444f8ff9cdaf5809d6164f3bd21a (patch) | |
| tree | 68989b92431127a6fa24e3b1988f20db1831bd8f /services/core | |
| parent | b2dd5cb900d031acf255bddcbe2f57efb8f43adb (diff) | |
| parent | 4361549891e721ede7ce4955c5785d9d3d908554 (diff) | |
| download | frameworks_base-3457ae4709c8444f8ff9cdaf5809d6164f3bd21a.zip frameworks_base-3457ae4709c8444f8ff9cdaf5809d6164f3bd21a.tar.gz frameworks_base-3457ae4709c8444f8ff9cdaf5809d6164f3bd21a.tar.bz2 | |
Merge "Revert "CEC: Let playback device switch TV input after bootup"" into lmp-mr1-dev
Diffstat (limited to 'services/core')
| -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 |