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

Commit ddfaa560 authored by Wale Ogunwale's avatar Wale Ogunwale Committed by android-build-merger
Browse files

Merge "Marked testFocusedWindowMultipleDisplays as flaky" into pi-dev am: e8b15263 

am: 2d6384ed

Change-Id: I128352ed77e6b9d4b50c051ba6cb99437b81112b
parents ddf57f1e 2d6384ed

services/tests/servicestests/src/com/android/server/wm/DisplayContentTests.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -33,7 +33,7 @@ import static com.android.server.wm.WindowContainer.POSITION_TOP; 
import static org.junit.Assert.assertEquals;

import static org.junit.Assert.assertEquals;

import static org.junit.Assert.assertTrue;

import static org.junit.Assert.assertTrue;





import org.junit.Ignore;

import android.support.test.filters.FlakyTest;

import org.junit.Test;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.junit.runner.RunWith;
@@ -300,7 +300,7 @@ public class DisplayContentTests extends WindowTestsBase { 
    }

    }





    @Test

    @Test

    @Ignore

    @FlakyTest(bugId = 37908381)

    public void testFocusedWindowMultipleDisplays() throws Exception {

    public void testFocusedWindowMultipleDisplays() throws Exception {

        // Create a focusable window and check that focus is calculated correctly

        // Create a focusable window and check that focus is calculated correctly

        final WindowState window1 =

        final WindowState window1 =