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

Commit ca5be9a8 authored by Jungshik Jang's avatar Jungshik Jang
Browse files

Remove SystemAudioAutoInitiationAction when SystemAudioActionFromAvr started. 

Bug: 15845309
Change-Id: I1eefeca3aab117f2def08fe9fbbea81987ef11a8
parent 44cecbc2

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

+1 −0
Original line number Original line Diff line number Diff line
@@ -496,6 +496,7 @@ final class HdmiCecLocalDeviceTv extends HdmiCecLocalDevice { 
                new SystemAudioActionFromTv(this, avr.getLogicalAddress(), enabled, callback));

                new SystemAudioActionFromTv(this, avr.getLogicalAddress(), enabled, callback));

    }

    }





    // # Seq 25

    void setSystemAudioMode(boolean on) {

    void setSystemAudioMode(boolean on) {

        synchronized (mLock) {

        synchronized (mLock) {

            if (on != mSystemAudioMode) {

            if (on != mSystemAudioMode) {

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

+4 −1
Original line number Original line Diff line number Diff line
@@ -22,6 +22,7 @@ import android.hardware.hdmi.IHdmiControlCallback; 
/**

/**

 * Feature action that handles System Audio initiated by AVR devices.

 * Feature action that handles System Audio initiated by AVR devices.

 */

 */

// # Seq 33

final class SystemAudioActionFromAvr extends SystemAudioAction {

final class SystemAudioActionFromAvr extends SystemAudioAction {

    /**

    /**

     * Constructor

     * Constructor
@@ -58,7 +59,9 @@ final class SystemAudioActionFromAvr extends SystemAudioAction { 
            sendSystemAudioModeRequest();

            sendSystemAudioModeRequest();

            return;

            return;

        }

        }

        // TODO: Stop the action for System Audio Mode initialization if it is running.



        removeAction(SystemAudioAutoInitiationAction.class);



        if (mTargetAudioStatus) {

        if (mTargetAudioStatus) {

            setSystemAudioMode(true);

            setSystemAudioMode(true);

            startAudioStatusAction();

            startAudioStatusAction();