Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 2ee0d6f4: CEC: Stop ARC if hotplug event is asserted low

Browse Source 
* commit '2ee0d6f44d7274bb1846cc6ff7a60451539a2b51':
  CEC: Stop ARC if hotplug event is asserted low
This commit is contained in:
Jinsuk Kim
2015-01-29 06:54:11 +00:00
committed by Android Git Automerger
parent 0cbbfb2bea 2ee0d6f44d
commit f4e4eb5401
1 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
View File

@@ -34,6 +34,7 @@ import android.annotation.Nullable;
import android.content.Context; import android.content.Context;
import android.hardware.hdmi.HdmiControlManager; import android.hardware.hdmi.HdmiControlManager;
import android.hardware.hdmi.HdmiDeviceInfo; import android.hardware.hdmi.HdmiDeviceInfo;
import android.hardware.hdmi.HdmiPortInfo;
import android.hardware.hdmi.HdmiRecordSources; import android.hardware.hdmi.HdmiRecordSources;
import android.hardware.hdmi.HdmiTimerRecordSources; import android.hardware.hdmi.HdmiTimerRecordSources;
import android.hardware.hdmi.IHdmiControlCallback; import android.hardware.hdmi.IHdmiControlCallback;
@@ -878,6 +879,17 @@ final class HdmiCecLocalDeviceTv extends HdmiCecLocalDevice {
return oldStatus; return oldStatus;
} }
@ServiceThreadOnly
private void updateArcFeatureStatus(int portId, boolean isConnected) {
assertRunOnServiceThread();
// HEAC 2.4, HEACT 5-15
// Should not activate ARC if +5V status is false.
HdmiPortInfo portInfo = mService.getPortInfo(portId);
if (portInfo.isArcSupported()) {
changeArcFeatureEnabled(isConnected);
}
}
private void notifyArcStatusToAudioService(boolean enabled) { private void notifyArcStatusToAudioService(boolean enabled) {
// Note that we don't set any name to ARC. // Note that we don't set any name to ARC.
mService.getAudioManager().setWiredDeviceConnectionState( mService.getAudioManager().setWiredDeviceConnectionState(
@@ -1509,6 +1521,7 @@ final class HdmiCecLocalDeviceTv extends HdmiCecLocalDevice {
// It covers seq #40, #43. // It covers seq #40, #43.
hotplugActions.get(0).pollAllDevicesNow(); hotplugActions.get(0).pollAllDevicesNow();
} }
updateArcFeatureStatus(portId, connected);
} }
private void removeCecSwitches(int portId) { private void removeCecSwitches(int portId) {