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

Commit 332bd729 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix SystemAudioAutoInitiationAction not started" am: e6bebf94 am:... 

Merge "Fix SystemAudioAutoInitiationAction not started" am: e6bebf94 am: e18c4d7d am: 6e95c7c7 am: 58cdf13a

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1772932

Change-Id: I5f6702c8037716964700547674f61089a29192c5
parents 33835ff9 58cdf13a

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

+8 −12
Original line number Diff line number Diff line
@@ -556,11 +556,9 @@ final class HdmiCecLocalDeviceTv extends HdmiCecLocalDevice { 
            }

        }



        if (!mService.isPowerStandbyOrTransient()) {

        addAndStartAction(new NewDeviceAction(this, activeSource.logicalAddress,

                activeSource.physicalAddress, deviceType));

    }

    }



    private boolean handleNewDeviceAtTheTailOfActivePath(int path) {

        // Seq #22
@@ -711,7 +709,6 @@ final class HdmiCecLocalDeviceTv extends HdmiCecLocalDevice { 
    @ServiceThreadOnly

    void onNewAvrAdded(HdmiDeviceInfo avr) {

        assertRunOnServiceThread();

        if (!mService.isPowerStandbyOrTransient()) {

        addAndStartAction(new SystemAudioAutoInitiationAction(this, avr.getLogicalAddress()));

        if (!isDirectConnectAddress(avr.getPhysicalAddress())) {

            startArcAction(false);
@@ -720,7 +717,6 @@ final class HdmiCecLocalDeviceTv extends HdmiCecLocalDevice { 
            startArcAction(true);

        }

    }

    }



    // Clear all device info.

    @ServiceThreadOnly