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

Commit 377dcbd5 authored by Jungshik Jang's avatar Jungshik Jang
Browse files

Hook up system audio mode 

Whenever system audio mode is changed, it should notify to AudioManager
so that AudioManager changes internal output or mute status accordingly.
To have more clear cut between last setting and current system audio mode,
renamed mSystemAudioMode into mSystemAudioActivated and added
getLastSystemAudioMode() which returns last system audio mode value stored
in global settings (NVM).

Bug: 16002150
Change-Id: I5d01d879c1c5a9a3f4b0cf2d25e9e74c26c52fa0
parent 12307ca8

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

+28 −46
Original line number Diff line number Diff line
@@ -21,9 +21,6 @@ import android.hardware.hdmi.HdmiCecDeviceInfo; 
import android.hardware.hdmi.HdmiControlManager;

import android.hardware.hdmi.IHdmiControlCallback;

import android.media.AudioManager;

import android.media.AudioManager.OnAudioPortUpdateListener;

import android.media.AudioPatch;

import android.media.AudioPort;

import android.media.AudioSystem;

import android.os.RemoteException;

import android.os.SystemProperties;
@@ -56,9 +53,10 @@ final class HdmiCecLocalDeviceTv extends HdmiCecLocalDevice { 
    // Whether ARC feature is enabled or not.

    private boolean mArcFeatureEnabled = false;



    // Whether SystemAudioMode is "On" or not.

    // Whether System audio mode is activated or not.

    // This becomes true only when all system audio sequences are finished.

    @GuardedBy("mLock")

    private boolean mSystemAudioMode;

    private boolean mSystemAudioActivated = false;



    // The previous port id (input) before switching to the new one. This is remembered in order to

    // be able to switch to it upon receiving <Inactive Source> from currently active source.
@@ -108,11 +106,8 @@ final class HdmiCecLocalDeviceTv extends HdmiCecLocalDevice { 
                mAddress, mService.getPhysicalAddress(), mDeviceType));

        mService.sendCecCommand(HdmiCecMessageBuilder.buildDeviceVendorIdCommand(

                mAddress, mService.getVendorId()));

        mSystemAudioMode = mService.readBooleanSetting(Global.HDMI_SYSTEM_AUDIO_ENABLED, false);

        launchRoutingControl(fromBootup);

        launchDeviceDiscovery();

        registerAudioPortUpdateListener();

        // TODO: unregister audio port update listener if local device is released.

    }



    @Override
@@ -130,30 +125,6 @@ final class HdmiCecLocalDeviceTv extends HdmiCecLocalDevice { 
        SystemProperties.set(Constants.PROPERTY_PREFERRED_ADDRESS_TV, String.valueOf(addr));

    }



    private void registerAudioPortUpdateListener() {

        mService.getAudioManager().registerAudioPortUpdateListener(

                new OnAudioPortUpdateListener() {

                    @Override

                    public void OnAudioPatchListUpdate(AudioPatch[] patchList) {}



                    @Override

                    public void OnAudioPortListUpdate(AudioPort[] portList) {

                        if (!mSystemAudioMode) {

                            return;

                        }

                        int devices = mService.getAudioManager().getDevicesForStream(

                                AudioSystem.STREAM_MUSIC);

                        if ((devices & ~AudioSystem.DEVICE_ALL_HDMI_SYSTEM_AUDIO_AND_SPEAKER)

                                != 0) {

                            // TODO: release system audio here.

                        }

                    }



                    @Override

                    public void OnServiceDied() {}

                });

    }



    /**

     * Performs the action 'device select', or 'one touch play' initiated by TV.

     *
@@ -565,7 +536,7 @@ final class HdmiCecLocalDeviceTv extends HdmiCecLocalDevice { 
                        // If there is AVR, initiate System Audio Auto initiation action,

                        // which turns on and off system audio according to last system

                        // audio setting.

                        if (mSystemAudioMode && getAvrDeviceInfo() != null) {

                        if (mSystemAudioActivated && getAvrDeviceInfo() != null) {

                            addAndStartAction(new SystemAudioAutoInitiationAction(

                                    HdmiCecLocalDeviceTv.this,

                                    getAvrDeviceInfo().getLogicalAddress()));
@@ -608,23 +579,36 @@ final class HdmiCecLocalDeviceTv extends HdmiCecLocalDevice { 


    // # Seq 25

    void setSystemAudioMode(boolean on, boolean updateSetting) {

        synchronized (mLock) {

            if (on != mSystemAudioMode) {

                mSystemAudioMode = on;

        if (updateSetting) {

            mService.writeBooleanSetting(Global.HDMI_SYSTEM_AUDIO_ENABLED, on);

        }

        updateAudioManagerForSystemAudio(on);

        synchronized (mLock) {

            if (mSystemAudioActivated != on) {

                mSystemAudioActivated = on;

                mService.announceSystemAudioModeChange(on);

            }

        }

    }



    boolean getSystemAudioMode() {

    private void updateAudioManagerForSystemAudio(boolean on) {

        // TODO: remove output device, once update AudioManager api.

        mService.getAudioManager().setHdmiSystemAudioSupported(on);

    }



    boolean isSystemAudioActivated() {

        if (getAvrDeviceInfo() == null) {

            return false;

        }

        synchronized (mLock) {

            return mSystemAudioMode;

            return mSystemAudioActivated;

        }

    }



    boolean getSystemAudioModeSetting() {

        return mService.readBooleanSetting(Global.HDMI_SYSTEM_AUDIO_ENABLED, false);

    }



    /**

     * Change ARC status into the given {@code enabled} status.

     *
@@ -722,7 +706,7 @@ final class HdmiCecLocalDeviceTv extends HdmiCecLocalDevice { 
    @ServiceThreadOnly

    void changeVolume(int curVolume, int delta, int maxVolume) {

        assertRunOnServiceThread();

        if (delta == 0 || !isSystemAudioOn()) {

        if (delta == 0 || !isSystemAudioActivated()) {

            return;

        }
@@ -750,7 +734,7 @@ final class HdmiCecLocalDeviceTv extends HdmiCecLocalDevice { 
    @ServiceThreadOnly

    void changeMute(boolean mute) {

        assertRunOnServiceThread();

        if (!isSystemAudioOn()) {

        if (!isSystemAudioActivated()) {

            return;

        }
@@ -761,12 +745,10 @@ final class HdmiCecLocalDeviceTv extends HdmiCecLocalDevice { 
    }



    private boolean isSystemAudioOn() {

        if (getAvrDeviceInfo() == null) {

            return false;

        }





        synchronized (mLock) {

            return mSystemAudioMode;

            return mSystemAudioActivated;

        }

    }

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

+1 −1
Original line number Diff line number Diff line
@@ -827,7 +827,7 @@ public final class HdmiControlService extends SystemService { 
            if (tv == null) {

                return false;

            }

            return tv.getSystemAudioMode();

            return tv.isSystemAudioActivated();

        }



        @Override

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

+1 −1
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ final class HotplugDetectionAction extends FeatureAction { 
        if (mTimeoutCount == 0) {

            pollAllDevices();

        } else {

            if (tv().getSystemAudioMode()) {

            if (tv().isSystemAudioActivated()) {

                pollAudioSystem();

            }

        }

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

+1 −1
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ final class NewDeviceAction extends FeatureAction { 


        if (HdmiUtils.getTypeFromAddress(mDeviceLogicalAddress)

                == HdmiCecDeviceInfo.DEVICE_AUDIO_SYSTEM) {

            if (tv().getSystemAudioMode()) {

            if (tv().getSystemAudioModeSetting()) {

                addAndStartAction(new SystemAudioAutoInitiationAction(localDevice(),

                        mDeviceLogicalAddress));

            }

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

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ final class SystemAudioActionFromAvr extends SystemAudioAction { 
    }



    private void handleSystemAudioActionFromAvr() {

        if (mTargetAudioStatus == tv().getSystemAudioMode()) {

        if (mTargetAudioStatus == tv().isSystemAudioActivated()) {

            finishWithCallback(HdmiControlManager.RESULT_SUCCESS);

            return;

        }