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

Commit d5bf22e0 authored by Louis Chang's avatar Louis Chang Committed by Automerger Merge Worker
Browse files

Fix AssistDataRequesterTest Flakiness am: 947d06ee 

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



Change-Id: I277b06aa8408f02a0eebe6dcc4fb2751e246c603
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 78401e7e 947d06ee

services/tests/wmtests/src/com/android/server/wm/AssistDataRequesterTest.java

+3 −9
Original line number Diff line number Diff line
@@ -317,7 +317,8 @@ public class AssistDataRequesterTest { 
        assertEquals("Expected " + numPendingScreenshots + " pending screenshots, got "

                        + mDataRequester.getPendingScreenshotCount(),

                numPendingScreenshots, mDataRequester.getPendingScreenshotCount());

        assertFalse("Expected request NOT completed", mCallbacks.mRequestCompleted);

        assertEquals("Expected request NOT completed, unless no pending data",

                numPendingData == 0 && numPendingScreenshots == 0, mCallbacks.mRequestCompleted);

        mGate.countDown();

        waitForIdle(mHandler);

        assertEquals("Expected " + numReceivedData + " data, received "
@@ -376,14 +377,7 @@ public class AssistDataRequesterTest { 


        @Override

        public void onAssistRequestCompleted() {

            mHandler.post(() -> {

                try {

                    mGate.await(10, TimeUnit.SECONDS);

            mRequestCompleted = true;

                } catch (InterruptedException e) {

                    Log.e(TAG, "Failed to wait", e);

                }

            });

        }

    }

}