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

Commit fc9798b8 authored by Winni Chang's avatar Winni Chang Committed by Android (Google) Code Review
Browse files

Merge "Keep SAM when eARC is enabled." into main

parents 8af77416 f365c2cf

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

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

        removeAction(AbsoluteVolumeAudioStatusAction.class);



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

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

            disableSystemAudioIfExist();

        }

        disableArcIfExist();



        super.disableDevice(initiatedByCec, callback);

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

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

    }



    private boolean isEarcEnabled() {

    public boolean isEarcEnabled() {

        synchronized (mLock) {

            return mEarcEnabled;

        }