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

Merge "Fix SystemAudioAutoInitiationAction not started"

Browse Source
This commit is contained in:
Treehugger Robot
2021-10-05 12:49:29 +00:00
committed by Gerrit Code Review
parent 5757f89ddc c5093cfb71
commit e6bebf94ed
1 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -619,11 +619,9 @@ 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) {
// Seq #22 // Seq #22
@@ -798,7 +796,6 @@ 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);
@@ -807,7 +804,6 @@ final class HdmiCecLocalDeviceTv extends HdmiCecLocalDevice {
startArcAction(true); startArcAction(true);
} }
} }
}
// Clear all device info. // Clear all device info.
@ServiceThreadOnly @ServiceThreadOnly