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

Commit 59d73f10 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 am: 4dbacb2d

Change-Id: I7c42c6d8b43ad87e402680ef5efe1694b7b5f5a6
parents 5543ca48 4dbacb2d

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

+3 −2
Original line number Original line Diff line number Diff line
@@ -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) {