summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorYuncheol Heo <ycheo@google.com>2014-10-06 16:16:45 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-10-06 16:16:47 +0000
commit71c4578def00a5a4b9e159fd1ab88e616bc7e159 (patch)
tree548b89b42073b28a11fec6f17d8124d51033e055 /services
parent4c88087776305f54bec0aae59b8e63bc803c1401 (diff)
parent995fcfc5919b7375d2d8cbc2ca5e08e193ffaf17 (diff)
downloadframeworks_base-71c4578def00a5a4b9e159fd1ab88e616bc7e159.zip
frameworks_base-71c4578def00a5a4b9e159fd1ab88e616bc7e159.tar.gz
frameworks_base-71c4578def00a5a4b9e159fd1ab88e616bc7e159.tar.bz2
Merge "CEC: Reset active source status on routing control" into lmp-dev
Diffstat (limited to 'services')
-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 3bd0bcf..e8ab673 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;
}
}