tree f99ff9ffae89c7f455806b727e6ca10b69c78265
parent 64d112638ab0fd7af53ae8cc8df913412a8391f1
author Andrey Kulikov <andreykulikov@google.com> 1574958360 +0000
committer Andrey Kulikov <andreykulikov@google.com> 1575547323 +0000

Fix for the children of WithConstraints not being remeasured sometimes

There was a case in AndroidOwner.measureAndLayout when our code started crashing with ConcurrentModificationException. It was happening because while we were iterating through the `relayoutNodes` list we tried to add more items into this list inside requestRelayout() which was called during WithConstraints subcomposition happening within the measure pass. Originally we decided to solve this by ignoring the remeasure/relayout requests when we currently executing measureAndLayout. And this worked for simple cases when inside WithConstraints we compose only the direct layout children or when all the layout layers are measuring their children in the measure block(so affectsParentSize is true). This worked because right after WithConstraints subcomposition we would call measure on all the direct children of the WithConstraints, plus all their children measured in the measure block and so on. But when our hierarchy is more complex and we have some fixed size layouts like Container this doesn't work anymore as we will not remeasure their children.
To solve this I don't ignore requestRemeasure() anymore, but save this nodes into a separate list and after iterating through the main list I check is there some nodes left in the temporary list which are not measured yet and iterate again if we have some. This ensures we remeasure all the affected layout nodes.

Test: covered this use case with a new test
Change-Id: Ib264c595fc53a063a0cd394995cba3c2a1546cba