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

Commit 59176da5 authored by Amy's avatar Amy Committed by shubang
Browse files

Modify on hotPlug logic for Audio devices 

ag/5259084

The onHotPlug logic applied to only TV and pure playback device before.
Modify it to apply to Audio/Playback device with TvInput.

Test: local tested
Bug: 117291910
Change-Id: I1f885ab44f77fc6c4a80c8d04f30477b76d81ea6
parent 5c6026b4

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

+19 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import android.annotation.Nullable; 
import android.content.Intent;

import android.hardware.hdmi.HdmiControlManager;

import android.hardware.hdmi.HdmiDeviceInfo;

import android.hardware.hdmi.HdmiPortInfo;

import android.hardware.hdmi.IHdmiControlCallback;

import android.media.AudioDeviceInfo;

import android.media.AudioManager;
@@ -179,6 +180,24 @@ public class HdmiCecLocalDeviceAudioSystem extends HdmiCecLocalDeviceSource { 
        mService.invokeDeviceEventListeners(info, status);

    }



    @Override

    @ServiceThreadOnly

    void onHotplug(int portId, boolean connected) {

        assertRunOnServiceThread();

        if (connected) {

            mService.wakeUp();

        }

        if (mService.getPortInfo(portId).getType() == HdmiPortInfo.PORT_OUTPUT) {

            mCecMessageCache.flushAll();

        } else {

            if (connected) {

                // TODO(amyjojo): start the device discovery action

            } else {

                // TODO(amyjojo): remove device from mDeviceInfo

            }

        }

    }



    @Override

    @ServiceThreadOnly

    protected void onStandby(boolean initiatedByCec, int standbyAction) {

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

+4 −1
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package com.android.server.hdmi; 
import static com.android.internal.os.RoSystemProperties.PROPERTY_HDMI_IS_DEVICE_HDMI_CEC_SWITCH;



import android.hardware.hdmi.HdmiControlManager;

import android.hardware.hdmi.HdmiPortInfo;

import android.hardware.hdmi.IHdmiControlCallback;

import android.os.SystemProperties;

import android.util.Slog;
@@ -73,7 +74,9 @@ abstract class HdmiCecLocalDeviceSource extends HdmiCecLocalDevice { 
    @ServiceThreadOnly

    void onHotplug(int portId, boolean connected) {

        assertRunOnServiceThread();

        if (mService.getPortInfo(portId).getType() == HdmiPortInfo.PORT_OUTPUT) {

            mCecMessageCache.flushAll();

        }

        // We'll not clear mIsActiveSource on the hotplug event to pass CETC 11.2.2-2 ~ 3.

        if (connected) {

            mService.wakeUp();

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

+3 −2
Original line number Diff line number Diff line
@@ -1008,8 +1008,9 @@ public class HdmiControlService extends SystemService { 
    void onHotplug(int portId, boolean connected) {

        assertRunOnServiceThread();



        if (connected && !isTvDevice()) {

            if (getPortInfo(portId).getType() == HdmiPortInfo.PORT_OUTPUT && isSwitchDevice()) {

        if (connected && !isTvDevice()

                && getPortInfo(portId).getType() == HdmiPortInfo.PORT_OUTPUT) {

            if (isSwitchDevice()) {

                initPortInfo();

                HdmiLogger.debug("initPortInfo for switch device when onHotplug from tx.");

            }