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

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

Browse Source 
Change-Id: I14e114c9660113ffd9f59ce136e7e73ea947c18f
This commit is contained in:
TreeHugger Robot
2020-05-25 19:54:30 +00:00
committed by Automerger Merge Worker
parent dc84372155 b3898ee44e
commit d3667d022e
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/hdmi/HdmiCecLocalDevicePlayback.java
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) {