Merge "Only send <Standby> to TV on sleep when active source" into rvc-dev am: b3898ee44e am: 63606f2025

Change-Id: Ifccf9a0f3026748e1c4c9953256958d9169917ea
This commit is contained in:
TreeHugger Robot
2020-05-25 20:12:09 +00:00
committed by Automerger Merge Worker

View File

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