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

Commit f365c2cf authored by Winni Chang's avatar Winni Chang
Browse files

Keep SAM when eARC is enabled. 

Bug: 286504656
Test: atest
Change-Id: I23964535913d3e676efbd70e0df563556114b7b2
parent 0f7df71a

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

+4 −1
Original line number Original line Diff line number Diff line
@@ -1326,7 +1326,10 @@ public final class HdmiCecLocalDeviceTv extends HdmiCecLocalDevice { 
        removeAction(NewDeviceAction.class);

        removeAction(NewDeviceAction.class);

        removeAction(AbsoluteVolumeAudioStatusAction.class);

        removeAction(AbsoluteVolumeAudioStatusAction.class);





        // Keep SAM enabled if eARC is enabled, unless we're going to Standby.

        if (initiatedByCec || !mService.isEarcEnabled()){

            disableSystemAudioIfExist();

            disableSystemAudioIfExist();

        }

        disableArcIfExist();

        disableArcIfExist();





        super.disableDevice(initiatedByCec, callback);

        super.disableDevice(initiatedByCec, callback);

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -3610,7 +3610,7 @@ public class HdmiControlService extends SystemService { 
        }

        }

    }

    }





    private boolean isEarcEnabled() {

    public boolean isEarcEnabled() {

        synchronized (mLock) {

        synchronized (mLock) {

            return mEarcEnabled;

            return mEarcEnabled;

        }

        }