From fb207fadfa17023e48c33318088ed91636178f4b Mon Sep 17 00:00:00 2001 From: Marvin Ramin Date: Thu, 29 Oct 2020 13:08:31 +0100 Subject: [PATCH] Fix flaky test Fix flaky unit test HdmiControlServiceTest#getCecVersion_default Bug: 171956714 Test: atest HdmiControlServiceTest (multiple times) Change-Id: Iba6ad8284abfbd9340a893ed5625bbe4dc2598e0 --- .../src/com/android/server/hdmi/HdmiControlServiceTest.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/services/tests/servicestests/src/com/android/server/hdmi/HdmiControlServiceTest.java b/services/tests/servicestests/src/com/android/server/hdmi/HdmiControlServiceTest.java index 382ae8218729b..68b46c4080289 100644 --- a/services/tests/servicestests/src/com/android/server/hdmi/HdmiControlServiceTest.java +++ b/services/tests/servicestests/src/com/android/server/hdmi/HdmiControlServiceTest.java @@ -382,9 +382,13 @@ public class HdmiControlServiceTest { assertThat(callback2.mVolumeControlEnabled).isTrue(); } - @Test public void getCecVersion_default() { + // Set the Settings value to "null" to emulate it being empty and force the default value. + Settings.Global.putString(mContextSpy.getContentResolver(), + Settings.Global.HDMI_CEC_VERSION, + null); + mHdmiControlService.setControlEnabled(true); assertThat(mHdmiControlService.getCecVersion()).isEqualTo(Constants.VERSION_1_4); }