diff options
author | Jinsuk Kim <jinsukkim@google.com> | 2015-05-10 23:12:14 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-10 23:12:16 +0000 |
commit | 1c86159142aa8b5d582cd53e1d16b874c99d3bc4 (patch) | |
tree | 93f9d95fdd1d8e9cc8a9ee6953b77c3c128aa227 /services/core/java/com/android/server/hdmi | |
parent | fced534dec1088bdd7da1495d76b73996dc8a1a1 (diff) | |
parent | 37f5bc281c40965f8604400d700e68c0d17e77b0 (diff) | |
download | frameworks_base-1c86159142aa8b5d582cd53e1d16b874c99d3bc4.zip frameworks_base-1c86159142aa8b5d582cd53e1d16b874c99d3bc4.tar.gz frameworks_base-1c86159142aa8b5d582cd53e1d16b874c99d3bc4.tar.bz2 |
Merge "CEC: Update ARC feature flag on hotplug" into mnc-dev
Diffstat (limited to 'services/core/java/com/android/server/hdmi')
-rw-r--r-- | services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java b/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java index e650456..51ba32d 100644 --- a/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java +++ b/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java @@ -906,14 +906,22 @@ final class HdmiCecLocalDeviceTv extends HdmiCecLocalDevice { @ServiceThreadOnly private void updateArcFeatureStatus(int portId, boolean isConnected) { assertRunOnServiceThread(); + HdmiPortInfo portInfo = mService.getPortInfo(portId); + if (!portInfo.isArcSupported()) { + return; + } HdmiDeviceInfo avr = getAvrDeviceInfo(); if (avr == null) { + if (isConnected) { + // Update the status (since TV may not have seen AVR yet) so + // that ARC can be initiated after discovery. + mArcFeatureEnabled.put(portId, isConnected); + } return; } // HEAC 2.4, HEACT 5-15 // Should not activate ARC if +5V status is false. - HdmiPortInfo portInfo = mService.getPortInfo(portId); - if (avr.getPortId() == portId && portInfo.isArcSupported()) { + if (avr.getPortId() == portId) { changeArcFeatureEnabled(portId, isConnected); } } |