summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Yuncheol Heo <ycheo@google.com> 2014-10-06 16:30:02 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2014-10-06 16:30:02 +0000
commit345f3d00b8dccb68988bdf9f6fb069fcfe06bb24 (patch)
tree81bd49406fd81dcf1a305fa34d710d08397a63d8
parent31409c0ccd1434efdcfff8f7ddcd7c4207660104 (diff)
parent4cb8455fba9b70339bacf28ff813118ad542165d (diff)
am 4cb8455f: am 71c4578d: Merge "CEC: Reset active source status on routing control" into lmp-dev
* commit '4cb8455fba9b70339bacf28ff813118ad542165d': CEC: Reset active source status on routing control
-rw-r--r--services/core/java/com/android/server/hdmi/HdmiCecLocalDevicePlayback.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/hdmi/HdmiCecLocalDevicePlayback.java b/services/core/java/com/android/server/hdmi/HdmiCecLocalDevicePlayback.java
index 3bd0bcfc02ae..e8ab6732932f 100644
--- a/services/core/java/com/android/server/hdmi/HdmiCecLocalDevicePlayback.java
+++ b/services/core/java/com/android/server/hdmi/HdmiCecLocalDevicePlayback.java
@@ -183,6 +183,8 @@ final class HdmiCecLocalDevicePlayback extends HdmiCecLocalDevice {
private void maySetActiveSource(int physicalAddress) {
if (physicalAddress == mService.getPhysicalAddress()) {
mIsActiveSource = true;
+ } else {
+ mIsActiveSource = false;
}
}