Merge "Only send <Standby> to TV on sleep when active source" into rvc-dev

This commit is contained in:
TreeHugger Robot
2020-05-25 19:37:36 +00:00
committed by Android (Google) Code Review

View File

@@ -165,10 +165,11 @@ public class HdmiCecLocalDevicePlayback extends HdmiCecLocalDeviceSource {
mService.sendCecCommand(HdmiCecMessageBuilder.buildInactiveSource( mService.sendCecCommand(HdmiCecMessageBuilder.buildInactiveSource(
mAddress, mService.getPhysicalAddress())); mAddress, mService.getPhysicalAddress()));
} }
boolean wasActiveSource = mIsActiveSource;
// Invalidate the internal active source record when goes to standby // Invalidate the internal active source record when goes to standby
// This set will also update mIsActiveSource // This set will also update mIsActiveSource
mService.setActiveSource(Constants.ADDR_INVALID, Constants.INVALID_PHYSICAL_ADDRESS); mService.setActiveSource(Constants.ADDR_INVALID, Constants.INVALID_PHYSICAL_ADDRESS);
if (initiatedByCec || !mAutoTvOff) { if (initiatedByCec || !mAutoTvOff || !wasActiveSource) {
return; return;
} }
switch (standbyAction) { switch (standbyAction) {