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

Commit 4c5ce876 authored by Daniel Hsieh's avatar Daniel Hsieh Committed by Automerger Merge Worker
Browse files

Merge "Fixes flaky tests" into tm-dev am: 8fbc44fb 

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



Change-Id: Ie15c77820b2bb80298622d8259fe4b44e49511ec
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4a80bbf4 8fbc44fb

packages/SystemUI/tests/src/com/android/systemui/accessibility/MockMagnificationAnimationCallback.java

+3 −1
Original line number Diff line number Diff line
@@ -44,11 +44,13 @@ public class MockMagnificationAnimationCallback extends IRemoteMagnificationAnim 


    @Override

    public void onResult(boolean success) throws RemoteException {

        mCountDownLatch.countDown();

        if (success) {

            mSuccessCount.getAndIncrement();

        } else {

            mFailedCount.getAndIncrement();

        }

        // It should be put at the last line to avoid making CountDownLatch#await passed without

        // updating values.

        mCountDownLatch.countDown();

    }

}

packages/SystemUI/tests/src/com/android/systemui/accessibility/WindowMagnificationControllerTest.java

+0 −3
Original line number Diff line number Diff line
@@ -80,7 +80,6 @@ import com.android.systemui.utils.os.FakeHandler; 


import org.junit.After;

import org.junit.Before;

import org.junit.Ignore;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.Answers;
@@ -319,7 +318,6 @@ public class WindowMagnificationControllerTest extends SysuiTestCase { 
        verify(mSfVsyncFrameProvider, atLeastOnce()).postFrameCallback(any());

    }



    @Ignore("b/224717753")

    @Test

    public void moveWindowMagnifierToPositionWithAnimation_expectedValuesAndInvokeCallback()

            throws InterruptedException {
@@ -354,7 +352,6 @@ public class WindowMagnificationControllerTest extends SysuiTestCase { 
        assertEquals(mWindowMagnificationController.getCenterY(), targetCenterY, 0);

    }



    @Ignore("b/224717753")

    @Test

    public void moveWindowMagnifierToPositionMultipleTimes_expectedValuesAndInvokeCallback()

            throws InterruptedException {