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

Commit 1c3290d8 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Remove redundant logs in HdmiControlServiceTests" into sc-dev am: 1193abc0 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13872934

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id0bbdb171d96a828207ec23e526af4e1e8256f79
parents 1c20bfe0 1193abc0

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

+0 −5
Original line number Original line Diff line number Diff line
@@ -45,7 +45,6 @@ import android.os.RemoteException; 
import android.os.test.TestLooper;

import android.os.test.TestLooper;

import android.platform.test.annotations.Presubmit;

import android.platform.test.annotations.Presubmit;

import android.provider.Settings;

import android.provider.Settings;

import android.util.Log;





import androidx.test.InstrumentationRegistry;

import androidx.test.InstrumentationRegistry;

import androidx.test.filters.SmallTest;

import androidx.test.filters.SmallTest;
@@ -667,7 +666,6 @@ public class HdmiControlServiceTest { 
    @Test

    @Test

    public void initCecVersion_limitToMinimumSupportedVersion() {

    public void initCecVersion_limitToMinimumSupportedVersion() {

        mNativeWrapper.setCecVersion(HdmiControlManager.HDMI_CEC_VERSION_1_4_B);

        mNativeWrapper.setCecVersion(HdmiControlManager.HDMI_CEC_VERSION_1_4_B);

        Log.e("MARVIN", "set setting CEC");

        mHdmiControlService.getHdmiCecConfig().setIntValue(

        mHdmiControlService.getHdmiCecConfig().setIntValue(

                HdmiControlManager.CEC_SETTING_NAME_HDMI_CEC_VERSION,

                HdmiControlManager.CEC_SETTING_NAME_HDMI_CEC_VERSION,

                HdmiControlManager.HDMI_CEC_VERSION_2_0);

                HdmiControlManager.HDMI_CEC_VERSION_2_0);
@@ -679,9 +677,7 @@ public class HdmiControlServiceTest { 




    @Test

    @Test

    public void initCecVersion_limitToAtLeast1_4() {

    public void initCecVersion_limitToAtLeast1_4() {

        Log.e("MARVIN", "set HAL CEC to 0");

        mNativeWrapper.setCecVersion(0x0);

        mNativeWrapper.setCecVersion(0x0);

        Log.e("MARVIN", "set setting CEC to 2");

        mHdmiControlService.getHdmiCecConfig().setIntValue(

        mHdmiControlService.getHdmiCecConfig().setIntValue(

                HdmiControlManager.CEC_SETTING_NAME_HDMI_CEC_VERSION,

                HdmiControlManager.CEC_SETTING_NAME_HDMI_CEC_VERSION,

                HdmiControlManager.HDMI_CEC_VERSION_2_0);

                HdmiControlManager.HDMI_CEC_VERSION_2_0);
@@ -694,7 +690,6 @@ public class HdmiControlServiceTest { 
    @Test

    @Test

    public void initCecVersion_useHighestMatchingVersion() {

    public void initCecVersion_useHighestMatchingVersion() {

        mNativeWrapper.setCecVersion(HdmiControlManager.HDMI_CEC_VERSION_2_0);

        mNativeWrapper.setCecVersion(HdmiControlManager.HDMI_CEC_VERSION_2_0);

        Log.e("MARVIN", "set setting CEC");

        mHdmiControlService.getHdmiCecConfig().setIntValue(

        mHdmiControlService.getHdmiCecConfig().setIntValue(

                HdmiControlManager.CEC_SETTING_NAME_HDMI_CEC_VERSION,

                HdmiControlManager.CEC_SETTING_NAME_HDMI_CEC_VERSION,

                HdmiControlManager.HDMI_CEC_VERSION_2_0);

                HdmiControlManager.HDMI_CEC_VERSION_2_0);