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

Commit 10a9124a authored by Amy's avatar Amy Committed by Shubang Lu
Browse files

Add callback to sendCecCommand in SendKeyEventAction when handling 

volume key forwarding.

The device that is not directly connected with audio system device
is not able to detect when the audio system is unplugged. So the send
key event action needs to callback when the message can't be sent to
audio system any more (which means it's unglugged). The action should
also update the sam status because of the absence of audio system
device.

Test: manual
Bug: 123369653
Change-Id: I6259bad26b96622aebcf3430e770211c32a92f1b
(cherry picked from commit f1e61c1895e3a87e44e71a9c2f29f0077af58df0)
parent 131cbcc3

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

+22 −2
Original line number Diff line number Diff line
@@ -17,8 +17,10 @@ package com.android.server.hdmi; 


import static com.android.server.hdmi.HdmiConfig.IRT_MS;



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

import android.util.Slog;

import android.view.KeyEvent;

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



/**

 * Feature action that transmits remote control key command (User Control Press/
@@ -146,9 +148,27 @@ final class SendKeyAction extends HdmiCecFeatureAction { 
        if (cecKeycodeAndParams == null) {

            return;

        }

        // Devices that are not directly connected with audio system device can't detect if the

        // audio system device is still plugged in. Framework checks if the volume key forwarding is

        // successful or not every time to make sure the System Audio Mode status is still updated.

        if (mTargetAddress == Constants.ADDR_AUDIO_SYSTEM

            && localDevice().mAddress != Constants.ADDR_TV) {

            sendCommand(HdmiCecMessageBuilder.buildUserControlPressed(getSourceAddress(),

                mTargetAddress, cecKeycodeAndParams), new SendMessageCallback() {

                @Override

                public void onSendCompleted(int error) {

                    if (error != SendMessageResult.SUCCESS) {

                        HdmiLogger.debug(

                            "AVR did not respond to <User Control Pressed>");

                        localDevice().mService.setSystemAudioActivated(false);

                    }

                }

            });

        } else {

            sendCommand(HdmiCecMessageBuilder.buildUserControlPressed(getSourceAddress(),

                    mTargetAddress, cecKeycodeAndParams));

        }

    }



    private void sendKeyUp() {

        sendCommand(HdmiCecMessageBuilder.buildUserControlReleased(getSourceAddress(),