Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ebed5e15 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: I7d11c669774262ff7dc48ec78b7f9a5a3fc6142c
parents f3c73425 63606f20

services/core/java/com/android/server/hdmi/HdmiCecLocalDevicePlayback.java

+3 −2
Original line number Diff line number Diff line
@@ -165,10 +165,11 @@ public class HdmiCecLocalDevicePlayback extends HdmiCecLocalDeviceSource { 
            mService.sendCecCommand(HdmiCecMessageBuilder.buildInactiveSource(

                    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) {