summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jinsuk Kim <jinsukkim@google.com> 2015-01-29 06:40:46 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2015-01-29 06:40:47 +0000
commit43b2746bcdfb49aed255ac0f6dd6fb95909dcfc1 (patch)
treee63fe8540f8c8730daccde2cb094f1f2412614f2
parentd1698393e71f4792f98156bb963e5876bc8c2eb0 (diff)
parentc9914a22d827eba54fd7b928c84996bf6a62dc39 (diff)
Merge "CEC: Let <Active Source> from the active source work" into lmp-mr1-dev
-rw-r--r--services/core/java/com/android/server/hdmi/ActiveSourceHandler.java5
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 59d5605b8d85..7f48768f9af6 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);