Merge "Fix testMultipleConditions flake" into rvc-dev am: ecb9cfe093

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

Change-Id: Id05a6ba2f99349b857a6d0bfd7066705281aa998

cmds/statsd/tests/utils/MultiConditionTrigger_test.cpp

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