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

Commit 3d518037 authored by Wally Yau's avatar Wally Yau Committed by Android (Google) Code Review
Browse files

Merge "Reset system audio mode on startup rather than on stop."

parents 1f93cddd 951e3e42

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

+2 −4
Original line number Diff line number Diff line
@@ -785,6 +785,8 @@ final class HdmiCecLocalDeviceTv extends HdmiCecLocalDevice { 
                        HdmiDeviceInfo avr = getAvrDeviceInfo();

                        if (avr != null) {

                            onNewAvrAdded(avr);

                        } else {

                            setSystemAudioMode(false, true);

                        }

                    }

                });
@@ -1615,10 +1617,6 @@ final class HdmiCecLocalDeviceTv extends HdmiCecLocalDevice { 
        removeAction(SystemAudioAutoInitiationAction.class);

        removeAction(SystemAudioStatusAction.class);

        removeAction(VolumeControlAction.class);



        // Turn off the mode but do not write it the settings, so that the next time TV powers on

        // the system audio mode setting can be restored automatically.

        setSystemAudioMode(false, false);

    }



    @ServiceThreadOnly