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

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

Change-Id: I1434de22aeb1c837fd65c56ab083d2b1bfb6a229
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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

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

@@ -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 {