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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id0bbdb171d96a828207ec23e526af4e1e8256f79
This commit is contained in:
TreeHugger Robot
2021-03-15 16:47:02 +00:00
committed by Automerger Merge Worker

View File

@@ -45,7 +45,6 @@ import android.os.RemoteException;
import android.os.test.TestLooper;
import android.platform.test.annotations.Presubmit;
import android.provider.Settings;
import android.util.Log;
import androidx.test.InstrumentationRegistry;
import androidx.test.filters.SmallTest;
@@ -667,7 +666,6 @@ public class HdmiControlServiceTest {
@Test
public void initCecVersion_limitToMinimumSupportedVersion() {
mNativeWrapper.setCecVersion(HdmiControlManager.HDMI_CEC_VERSION_1_4_B);
Log.e("MARVIN", "set setting CEC");
mHdmiControlService.getHdmiCecConfig().setIntValue(
HdmiControlManager.CEC_SETTING_NAME_HDMI_CEC_VERSION,
HdmiControlManager.HDMI_CEC_VERSION_2_0);
@@ -679,9 +677,7 @@ public class HdmiControlServiceTest {
@Test
public void initCecVersion_limitToAtLeast1_4() {
Log.e("MARVIN", "set HAL CEC to 0");
mNativeWrapper.setCecVersion(0x0);
Log.e("MARVIN", "set setting CEC to 2");
mHdmiControlService.getHdmiCecConfig().setIntValue(
HdmiControlManager.CEC_SETTING_NAME_HDMI_CEC_VERSION,
HdmiControlManager.HDMI_CEC_VERSION_2_0);
@@ -694,7 +690,6 @@ public class HdmiControlServiceTest {
@Test
public void initCecVersion_useHighestMatchingVersion() {
mNativeWrapper.setCecVersion(HdmiControlManager.HDMI_CEC_VERSION_2_0);
Log.e("MARVIN", "set setting CEC");
mHdmiControlService.getHdmiCecConfig().setIntValue(
HdmiControlManager.CEC_SETTING_NAME_HDMI_CEC_VERSION,
HdmiControlManager.HDMI_CEC_VERSION_2_0);