Merge "Fix race condition in releasedCallback test"

2020-11-30 17:59:52 +00:00
parent 117b593699 53eaccb698
commit 1c04c810ad
1 changed files with 2 additions and 0 deletions
--- a/libs/hwui/tests/unit/RenderNodeTests.cpp
+++ b/libs/hwui/tests/unit/RenderNodeTests.cpp
@@ -264,6 +264,8 @@ TEST(RenderNode, releasedCallback) {
    TestUtils::runOnRenderThreadUnmanaged([&] (RenderThread&) {
        TestUtils::syncHierarchyPropertiesAndDisplayList(node);
    });
+    // Fence on any remaining post'd work
+    TestUtils::runOnRenderThreadUnmanaged([] (RenderThread&) {});
    EXPECT_EQ(2, counts.sync);
    EXPECT_EQ(1, counts.destroyed);
 }