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

Commit 951e3e42 authored by Wally Yau's avatar Wally Yau
Browse files

Reset system audio mode on startup rather than on stop. 

Bug fixed - When TV was turned off and AVR was on, audio was routed back
to TV momentarily before the TV turned off.

b/19791264

Change-Id: Iad639b6ba151b6615a7f4ce49fddfa4fc485e16c
(cherry picked from commit b0efbf3898e80181210103f6ac535af69d3abb2d)
parent 91a2eaf5

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