diff options
| author | Jinsuk Kim <jinsukkim@google.com> | 2015-01-29 06:50:41 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-29 06:50:41 +0000 |
| commit | 78c3a8ec42bb47ed7de09ed965c09723f1b4e264 (patch) | |
| tree | 8c955aa765a2b23970446eed32068ad6ab831822 /services | |
| parent | 3fec70a62a89cde8c893a66eff244d66212827ad (diff) | |
| parent | 43b2746bcdfb49aed255ac0f6dd6fb95909dcfc1 (diff) | |
| download | frameworks_base-78c3a8ec42bb47ed7de09ed965c09723f1b4e264.zip frameworks_base-78c3a8ec42bb47ed7de09ed965c09723f1b4e264.tar.gz frameworks_base-78c3a8ec42bb47ed7de09ed965c09723f1b4e264.tar.bz2 | |
am 43b2746b: Merge "CEC: Let <Active Source> from the active source work" into lmp-mr1-dev
* commit '43b2746bcdfb49aed255ac0f6dd6fb95909dcfc1':
CEC: Let <Active Source> from the active source work
Diffstat (limited to 'services')
| -rw-r--r-- | services/core/java/com/android/server/hdmi/ActiveSourceHandler.java | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/services/core/java/com/android/server/hdmi/ActiveSourceHandler.java b/services/core/java/com/android/server/hdmi/ActiveSourceHandler.java index 59d5605..7f48768 100644 --- a/services/core/java/com/android/server/hdmi/ActiveSourceHandler.java +++ b/services/core/java/com/android/server/hdmi/ActiveSourceHandler.java @@ -62,11 +62,6 @@ final class ActiveSourceHandler { void process(ActiveSource newActive, int deviceType) { // Seq #17 HdmiCecLocalDeviceTv tv = mSource; - ActiveSource activeSource = tv.getActiveSource(); - if (activeSource.equals(newActive)) { - invokeCallback(HdmiControlManager.RESULT_SUCCESS); - return; - } HdmiDeviceInfo device = mService.getDeviceInfo(newActive.logicalAddress); if (device == null) { tv.startNewDeviceAction(newActive, deviceType); |