diff options
| author | Jinsuk Kim <jinsukkim@google.com> | 2015-04-24 01:45:28 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-24 01:45:29 +0000 |
| commit | b3492138913260f9f7f26f50bb1122f8e99f8e4e (patch) | |
| tree | f2f82341800a5683aec5755d2dc4542a1d7f1caa | |
| parent | 786144599edceda0bcb27b77d2c54f161fd9fbf3 (diff) | |
| parent | a6d5dad9bf1f43e2b4cdf18728a4b7a0d4d76bb5 (diff) | |
| download | frameworks_base-b3492138913260f9f7f26f50bb1122f8e99f8e4e.zip frameworks_base-b3492138913260f9f7f26f50bb1122f8e99f8e4e.tar.gz frameworks_base-b3492138913260f9f7f26f50bb1122f8e99f8e4e.tar.bz2 | |
Merge "CEC: Check port id for ARC status update on hotplug"
| -rw-r--r-- | services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java | 6 |
1 files changed, 5 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 c4f410f..5ac027d 100644 --- a/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java +++ b/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java @@ -905,10 +905,14 @@ final class HdmiCecLocalDeviceTv extends HdmiCecLocalDevice { @ServiceThreadOnly private void updateArcFeatureStatus(int portId, boolean isConnected) { assertRunOnServiceThread(); + HdmiDeviceInfo avr = getAvrDeviceInfo(); + if (avr == null) { + return; + } // HEAC 2.4, HEACT 5-15 // Should not activate ARC if +5V status is false. HdmiPortInfo portInfo = mService.getPortInfo(portId); - if (portInfo.isArcSupported()) { + if (avr.getPortId() == portId && portInfo.isArcSupported()) { changeArcFeatureEnabled(portId, isConnected); } } |