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

Commit 13d6f8e4 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix testMultipleConditions flake" into rvc-dev am: ecb9cfe0 am:... 

Merge "Fix testMultipleConditions flake" into rvc-dev am: ecb9cfe0 am: 60d328b7 am: e393eb82 am: 7eb4c7cb

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

Change-Id: Ib976cd4571c267d04c0541d4a0a332448b762d53
parents 2080c70d 7eb4c7cb

cmds/statsd/tests/utils/MultiConditionTrigger_test.cpp

+2 −2
Original line number Diff line number Diff line
@@ -50,13 +50,13 @@ TEST(MultiConditionTrigger, TestMultipleConditions) { 
    });



    vector<thread> threads;

    vector<bool> done(numConditions, false);

    vector<int> done(numConditions, 0);



    int i = 0;

    for (const string& conditionName : conditionNames) {

        threads.emplace_back([&done, &conditionName, &trigger, i] {

            sleep_for(chrono::milliseconds(3));

            done[i] = true;

            done[i] = 1;

            trigger.markComplete(conditionName);

        });

        i++;