Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove redundant logs in HdmiControlServiceTests" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-03-15 16:26:42 +00:00
committed by Android (Google) Code Review
parent 1fcb030d0e 12c1644d4e
commit 1193abc020
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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);