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

Commit 4bd49943 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Attempt to deflake ScreenUndimDetectorTest by flushing main looper on setup and teardown."

parents ee3d06a0 8e38f4c3
Loading
Loading
Loading
Loading
+7 −2
Original line number Diff line number Diff line
@@ -38,13 +38,13 @@ import androidx.test.platform.app.InstrumentationRegistry;

import com.android.modules.utils.testing.TestableDeviceConfig;

import org.junit.After;
import org.junit.Before;
import org.junit.ClassRule;
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;
import org.mockito.MockitoAnnotations;

import java.util.Arrays;
import java.util.List;
@@ -86,7 +86,7 @@ public class ScreenUndimDetectorTest {

    @Before
    public void setup() {
        MockitoAnnotations.initMocks(this);
        InstrumentationRegistry.getInstrumentation().waitForIdleSync();

        DeviceConfig.setProperty(NAMESPACE_ATTENTION_MANAGER_SERVICE,
                KEY_UNDIMS_REQUIRED,
@@ -100,6 +100,11 @@ public class ScreenUndimDetectorTest {
        mScreenUndimDetector.systemReady(sContext);
    }

    @After
    public void tearDown() {
        InstrumentationRegistry.getInstrumentation().waitForIdleSync();
    }

    @Test
    public void recordScreenPolicy_disabledByFlag_noop() {
        DeviceConfig.setProperty(NAMESPACE_ATTENTION_MANAGER_SERVICE,