summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Yuncheol Heo <ycheo@google.com> 2014-10-06 16:22:17 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2014-10-06 16:22:17 +0000
commit4cb8455fba9b70339bacf28ff813118ad542165d (patch)
tree1269d73eb6153903292706524405505d31eb1f9c
parentb03b9759d3ec1f3dacde71314795a3451f67fbab (diff)
parent71c4578def00a5a4b9e159fd1ab88e616bc7e159 (diff)
am 71c4578d: Merge "CEC: Reset active source status on routing control" into lmp-dev
* commit '71c4578def00a5a4b9e159fd1ab88e616bc7e159': 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;
}
}