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

Commit 7fd7758d authored by Winni Chang's avatar Winni Chang Committed by Android (Google) Code Review
Browse files

Merge "Refactor behavior in onHotplug()" into main

parents b828ca64 3dfd0845

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

+3 −0
Original line number Diff line number Diff line
@@ -1404,6 +1404,9 @@ public class HdmiCecLocalDeviceTv extends HdmiCecLocalDevice { 
                if (connected) {

                    if (mArcEstablished) {

                        enableAudioReturnChannel(true);

                    } else {

                        HdmiLogger.debug("Restart ARC again");

                        onNewAvrAdded(getAvrDeviceInfo());

                    }

                } else {

                    enableAudioReturnChannel(false);

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

+2 −0
Original line number Diff line number Diff line
@@ -66,6 +66,7 @@ import androidx.test.InstrumentationRegistry; 
import androidx.test.filters.SmallTest;



import org.junit.Before;

import org.junit.Ignore;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.junit.runners.JUnit4;
@@ -1033,6 +1034,7 @@ public class HdmiCecLocalDeviceTvTest { 
    }



    @Test

    @Ignore("b/360768278")

    public void onHotplug_doNotSend_systemAudioModeRequestWithParameter(){

        // Add a device to the network and assert that this device is included in the list of

        // devices.