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

Merge "Fix SystemAudioAutoInitiationAction not started" am: e6bebf94ed am: e18c4d7d32 am: 6e95c7c760

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1772932

Change-Id: I568a0feaedcfcc12e830ce53bb0e0135a65638ef
This commit is contained in:
Treehugger Robot
2021-10-05 13:35:16 +00:00
committed by Automerger Merge Worker
parent a729ff4a21 6e95c7c760
commit 58cdf13ab9
1 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -556,10 +556,8 @@ final class HdmiCecLocalDeviceTv extends HdmiCecLocalDevice {
} }
} }
if (!mService.isPowerStandbyOrTransient()) { addAndStartAction(new NewDeviceAction(this, activeSource.logicalAddress,
addAndStartAction(new NewDeviceAction(this, activeSource.logicalAddress, activeSource.physicalAddress, deviceType));
activeSource.physicalAddress, deviceType));
}
} }
private boolean handleNewDeviceAtTheTailOfActivePath(int path) { private boolean handleNewDeviceAtTheTailOfActivePath(int path) {
@@ -711,14 +709,12 @@ final class HdmiCecLocalDeviceTv extends HdmiCecLocalDevice {
@ServiceThreadOnly @ServiceThreadOnly
void onNewAvrAdded(HdmiDeviceInfo avr) { void onNewAvrAdded(HdmiDeviceInfo avr) {
assertRunOnServiceThread(); assertRunOnServiceThread();
if (!mService.isPowerStandbyOrTransient()) { addAndStartAction(new SystemAudioAutoInitiationAction(this, avr.getLogicalAddress()));
addAndStartAction(new SystemAudioAutoInitiationAction(this, avr.getLogicalAddress())); if (!isDirectConnectAddress(avr.getPhysicalAddress())) {
if (!isDirectConnectAddress(avr.getPhysicalAddress())) { startArcAction(false);
startArcAction(false); } else if (isConnected(avr.getPortId()) && isArcFeatureEnabled(avr.getPortId())
} else if (isConnected(avr.getPortId()) && isArcFeatureEnabled(avr.getPortId()) && !hasAction(SetArcTransmissionStateAction.class)) {
&& !hasAction(SetArcTransmissionStateAction.class)) { startArcAction(true);
startArcAction(true);
}
} }
} }