diff options
| author | Jinsuk Kim <jinsukkim@google.com> | 2015-03-26 01:24:19 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-03-26 01:24:20 +0000 |
| commit | 1ad5cc3c232198a26ede90d5486524796b7dd3c1 (patch) | |
| tree | dbea743d2b3f9a95c20f34fa6603401d3d762f06 /services/core/java/com/android/server/hdmi | |
| parent | 005e9b81953a355abcff628cf21e251dcc0e3121 (diff) | |
| parent | 6b2a6177aad44466794a9262a4f2f2c209a3f2e5 (diff) | |
| download | frameworks_base-1ad5cc3c232198a26ede90d5486524796b7dd3c1.zip frameworks_base-1ad5cc3c232198a26ede90d5486524796b7dd3c1.tar.gz frameworks_base-1ad5cc3c232198a26ede90d5486524796b7dd3c1.tar.bz2 | |
Merge "Enable selecting device whose power status is not on"
Diffstat (limited to 'services/core/java/com/android/server/hdmi')
| -rw-r--r-- | services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java b/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java index 7c93e56..d5cb5e3 100644 --- a/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java +++ b/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java @@ -251,7 +251,9 @@ final class HdmiCecLocalDeviceTv extends HdmiCecLocalDevice { } int targetAddress = targetDevice.getLogicalAddress(); ActiveSource active = getActiveSource(); - if (active.isValid() && targetAddress == active.logicalAddress) { + if (targetDevice.getDevicePowerStatus() == HdmiControlManager.POWER_STATUS_ON + && active.isValid() + && targetAddress == active.logicalAddress) { invokeCallback(callback, HdmiControlManager.RESULT_SUCCESS); return; } |