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

Commit 5c7b7bd2 authored by Tang Lee's avatar Tang Lee Committed by Android (Google) Code Review
Browse files

Merge "Improve avoiding focus stealing due to queued ActiveSourceAction" into main

parents 22aaa565 870cbf1d

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

+4 −2
Original line number Diff line number Diff line
@@ -200,12 +200,14 @@ abstract class HdmiCecLocalDeviceSource extends HdmiCecLocalDevice { 
    void setActiveSource(int logicalAddress, int physicalAddress, String caller) {

        boolean wasActiveSource = isActiveSource();

        super.setActiveSource(logicalAddress, physicalAddress, caller);

        if (wasActiveSource && !isActiveSource()) {

        if (!isActiveSource()) {

            // Prevent focus stealing when losing active source.

            removeAction(ActiveSourceAction.class);

            if (wasActiveSource) {

                onActiveSourceLost();

            }

        }

    }



    @ServiceThreadOnly

    protected void setActiveSource(int physicalAddress, String caller) {