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

Commit 23be681a authored by Amy's avatar Amy Committed by shubang
Browse files

Add System Audio Mode Status handler to update sam status 

Note that we send out Give System Audio Mode message to potential audio
system device to trigger responce. If no responce, we set sam false.

Test: atest com.android.server.hdmi
Bug: 123369653
Change-Id: I7b54f7d54ff40d3abe0f5e4201fafbf8a05f54db
parent 25e23385

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

+32 −0
Original line number Original line Diff line number Diff line
@@ -19,6 +19,7 @@ package com.android.server.hdmi; 
import android.hardware.hdmi.HdmiControlManager;

import android.hardware.hdmi.HdmiControlManager;

import android.hardware.hdmi.HdmiDeviceInfo;

import android.hardware.hdmi.HdmiDeviceInfo;

import android.hardware.hdmi.IHdmiControlCallback;

import android.hardware.hdmi.IHdmiControlCallback;

import android.hardware.tv.cec.V1_0.SendMessageResult;

import android.os.PowerManager;

import android.os.PowerManager;

import android.os.PowerManager.WakeLock;

import android.os.PowerManager.WakeLock;

import android.os.SystemProperties;

import android.os.SystemProperties;
@@ -30,6 +31,7 @@ import com.android.internal.app.LocalePicker; 
import com.android.internal.app.LocalePicker.LocaleInfo;

import com.android.internal.app.LocalePicker.LocaleInfo;

import com.android.internal.util.IndentingPrintWriter;

import com.android.internal.util.IndentingPrintWriter;

import com.android.server.hdmi.HdmiAnnotations.ServiceThreadOnly;

import com.android.server.hdmi.HdmiAnnotations.ServiceThreadOnly;

import com.android.server.hdmi.HdmiControlService.SendMessageCallback;





import java.io.UnsupportedEncodingException;

import java.io.UnsupportedEncodingException;

import java.util.List;

import java.util.List;
@@ -85,6 +87,22 @@ public class HdmiCecLocalDevicePlayback extends HdmiCecLocalDeviceSource { 
                mAddress, mService.getPhysicalAddress(), mDeviceType));

                mAddress, mService.getPhysicalAddress(), mDeviceType));

        mService.sendCecCommand(HdmiCecMessageBuilder.buildDeviceVendorIdCommand(

        mService.sendCecCommand(HdmiCecMessageBuilder.buildDeviceVendorIdCommand(

                mAddress, mService.getVendorId()));

                mAddress, mService.getVendorId()));

        if (mService.audioSystem() == null) {

            // If current device is not a functional audio system device,

            // send message to potential audio system device in the system to get the system

            // audio mode status. If no response, set to false.

            mService.sendCecCommand(HdmiCecMessageBuilder.buildGiveSystemAudioModeStatus(

                    mAddress, Constants.ADDR_AUDIO_SYSTEM), new SendMessageCallback() {

                        @Override

                        public void onSendCompleted(int error) {

                            if (error != SendMessageResult.SUCCESS) {

                                HdmiLogger.debug(

                                        "AVR did not respond to <Give System Audio Mode Status>");

                                mService.setSystemAudioActivated(false);

                            }

                        }

                    });

        }

        startQueuedActions();

        startQueuedActions();

    }

    }
@@ -291,6 +309,20 @@ public class HdmiCecLocalDevicePlayback extends HdmiCecLocalDeviceSource { 
        return true;

        return true;

    }

    }





    @Override

    protected boolean handleSystemAudioModeStatus(HdmiCecMessage message) {

        // Only directly addressed System Audio Mode Status message can change internal

        // system audio mode status.

        if (message.getDestination() == mAddress

                && message.getSource() == Constants.ADDR_AUDIO_SYSTEM) {

            boolean setSystemAudioModeOn = HdmiUtils.parseCommandParamSystemAudioStatus(message);

            if (mService.isSystemAudioActivated() != setSystemAudioModeOn) {

                mService.setSystemAudioActivated(setSystemAudioModeOn);

            }

        }

        return true;

    }



    @Override

    @Override

    protected int findKeyReceiverAddress() {

    protected int findKeyReceiverAddress() {

        return Constants.ADDR_TV;

        return Constants.ADDR_TV;

services/tests/servicestests/src/com/android/server/hdmi/HdmiCecLocalDevicePlaybackTest.java

+12 −0
Original line number Original line Diff line number Diff line
@@ -100,6 +100,7 @@ public class HdmiCecLocalDevicePlaybackTest { 




    @Test

    @Test

    public void handleSetSystemAudioModeOn_audioSystemBroadcast() {

    public void handleSetSystemAudioModeOn_audioSystemBroadcast() {

        mHdmiControlService.setSystemAudioActivated(false);

        assertThat(mHdmiCecLocalDevicePlayback.mService.isSystemAudioActivated()).isFalse();

        assertThat(mHdmiCecLocalDevicePlayback.mService.isSystemAudioActivated()).isFalse();

        HdmiCecMessage message =

        HdmiCecMessage message =

                HdmiCecMessageBuilder.buildSetSystemAudioMode(

                HdmiCecMessageBuilder.buildSetSystemAudioMode(
@@ -120,4 +121,15 @@ public class HdmiCecLocalDevicePlaybackTest { 
        assertThat(mHdmiCecLocalDevicePlayback.handleSetSystemAudioMode(message)).isTrue();

        assertThat(mHdmiCecLocalDevicePlayback.handleSetSystemAudioMode(message)).isTrue();

        assertThat(mHdmiCecLocalDevicePlayback.mService.isSystemAudioActivated()).isTrue();

        assertThat(mHdmiCecLocalDevicePlayback.mService.isSystemAudioActivated()).isTrue();

    }

    }



    @Test

    public void handleSystemAudioModeStatusOn_DirectltToLocalDeviceFromAudioSystem() {

        mHdmiControlService.setSystemAudioActivated(false);

        assertThat(mHdmiCecLocalDevicePlayback.mService.isSystemAudioActivated()).isFalse();

        HdmiCecMessage message =

                HdmiCecMessageBuilder.buildReportSystemAudioMode(

                        Constants.ADDR_AUDIO_SYSTEM, mHdmiCecLocalDevicePlayback.mAddress, true);

        assertThat(mHdmiCecLocalDevicePlayback.handleSystemAudioModeStatus(message)).isTrue();

        assertThat(mHdmiCecLocalDevicePlayback.mService.isSystemAudioActivated()).isTrue();

    }

}
 
}