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

Commit aa8ae68c authored by Amy's avatar Amy Committed by shubang
Browse files

Fix hdmi framework tests. 

ag/5836043

Test: atest com.android.server.hdmi
Bug: 120845532
Change-Id: Ibcebfcc21ca7ef9ce6187c49ee96a9a3d1491e92
parent d984bc69

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

+4 −4
Original line number Diff line number Diff line
@@ -268,7 +268,7 @@ public class HdmiCecLocalDeviceAudioSystem extends HdmiCecLocalDeviceSource { 
        mTvSystemAudioModeSupport = false;

        // Record the last state of System Audio Control before going to standby

        synchronized (mLock) {

            SystemProperties.set(

            mService.writeStringSetting(

                    Constants.PROPERTY_LAST_SYSTEM_AUDIO_CONTROL,

                    mSystemAudioActivated ? "true" : "false");

        }
@@ -330,7 +330,7 @@ public class HdmiCecLocalDeviceAudioSystem extends HdmiCecLocalDeviceSource { 
    @ServiceThreadOnly

    protected void setPreferredAddress(int addr) {

        assertRunOnServiceThread();

        SystemProperties.set(

        mService.writeStringSetting(

                Constants.PROPERTY_PREFERRED_ADDRESS_AUDIO_SYSTEM, String.valueOf(addr));

    }
@@ -469,7 +469,7 @@ public class HdmiCecLocalDeviceAudioSystem extends HdmiCecLocalDeviceSource { 
    protected boolean handleRequestArcInitiate(HdmiCecMessage message) {

        assertRunOnServiceThread();

        removeAction(ArcInitiationActionFromAvr.class);

        if (!SystemProperties.getBoolean(Constants.PROPERTY_ARC_SUPPORT, true)) {

        if (!mService.readBooleanSetting(Constants.PROPERTY_ARC_SUPPORT, true)) {

            mService.maySendFeatureAbortCommand(message, Constants.ABORT_UNRECOGNIZED_OPCODE);

        } else if (!isDirectConnectToTv()) {

            HdmiLogger.debug("AVR device is not directly connected with TV");
@@ -829,7 +829,7 @@ public class HdmiCecLocalDeviceAudioSystem extends HdmiCecLocalDeviceSource { 
        boolean currentMuteStatus =

                mService.getAudioManager().isStreamMute(AudioManager.STREAM_MUSIC);

        if (currentMuteStatus == newSystemAudioMode) {

            if (SystemProperties.getBoolean(

            if (mService.readBooleanSetting(

                    Constants.PROPERTY_SYSTEM_AUDIO_MODE_MUTING_ENABLE, true)

                            || newSystemAudioMode) {

                mService.getAudioManager()

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

+1 −1
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ public class HdmiCecLocalDevicePlayback extends HdmiCecLocalDeviceSource { 
    @ServiceThreadOnly

    protected void setPreferredAddress(int addr) {

        assertRunOnServiceThread();

        SystemProperties.set(Constants.PROPERTY_PREFERRED_ADDRESS_PLAYBACK,

        mService.writeStringSetting(Constants.PROPERTY_PREFERRED_ADDRESS_PLAYBACK,

                String.valueOf(addr));

    }

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

+6 −0
Original line number Diff line number Diff line
@@ -646,6 +646,7 @@ public class HdmiControlService extends SystemService { 
        return enabled ? ENABLED : DISABLED;

    }



    @VisibleForTesting

    boolean readBooleanSetting(String key, boolean defVal) {

        ContentResolver cr = getContext().getContentResolver();

        return Global.getInt(cr, key, toInt(defVal)) == ENABLED;
@@ -656,6 +657,11 @@ public class HdmiControlService extends SystemService { 
        Global.putInt(cr, key, toInt(value));

    }



    void writeStringSetting(String key, String value) {

        ContentResolver cr = getContext().getContentResolver();

        Global.putString(cr, key, value);

    }



    private void initializeCec(int initiatedBy) {

        mAddressAllocated = false;

        mCecController.setOption(OptionKey.SYSTEM_CEC_CONTROL, true);

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

+2 −0
Original line number Diff line number Diff line
@@ -30,6 +30,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;
@@ -147,6 +148,7 @@ public class ArcInitiationActionFromAvrTest { 
        mTestLooper.dispatchAll();

    }



    @Ignore("b/120845532")

    @Test

    public void arcInitiation_requestActiveSource() {

        mSendCecCommandSuccess = true;

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

+0 −3
Original line number Diff line number Diff line
@@ -40,7 +40,6 @@ import androidx.test.filters.SmallTest; 
import com.android.server.hdmi.HdmiCecController.AllocateAddressCallback;



import org.junit.Before;

import org.junit.Ignore;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.junit.runners.JUnit4;
@@ -142,7 +141,6 @@ public class HdmiCecControllerTest { 
        assertEquals(ADDR_UNREGISTERED, mLogicalAddress);

    }



    @Ignore("b/110413065 Support multiple device types 4 and 5.")

    @Test

    public void testAllocatLogicalAddress_PlaybackPreferredNotOccupied() {

        mHdmiCecController.allocateLogicalAddress(DEVICE_PLAYBACK, ADDR_PLAYBACK_1, mCallback);
@@ -158,7 +156,6 @@ public class HdmiCecControllerTest { 
        assertEquals(ADDR_PLAYBACK_2, mLogicalAddress);

    }



    @Ignore("b/110413065 Support multiple device types 4 and 5.")

    @Test

    public void testAllocatLogicalAddress_PlaybackNoPreferredNotOcuppied() {

        mHdmiCecController.allocateLogicalAddress(DEVICE_PLAYBACK, ADDR_UNREGISTERED, mCallback);