| commit | daaf58b6d7feeac35319bb8a772f36986862b715 | [log] [tgz] |
|---|---|---|
| author | Haibo Huang <hhb@google.com> | Mon Sep 14 22:42:40 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 14 22:42:40 2020 +0000 |
| tree | 62133df832f112285c000ae6c8f630a1138b6243 | |
| parent | b0078e6d8dd973a420f012404c9eae80bbecbf89 [diff] | |
| parent | 8bffc122364d1657f946514b3a85ab09311539f1 [diff] |
Merge "Using DoAll" am: c9c9a268e6 am: d37cb7d9a7 am: 1287f45b5c am: dc9f101a12 am: 8bffc12236 Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1425470 Change-Id: I323108afd09452386871ce5e9ee763ec3cd15364
diff --git a/services/surfaceflinger/CompositionEngine/tests/CompositionEngineTest.cpp b/services/surfaceflinger/CompositionEngine/tests/CompositionEngineTest.cpp index d889d74..d5bf569 100644 --- a/services/surfaceflinger/CompositionEngine/tests/CompositionEngineTest.cpp +++ b/services/surfaceflinger/CompositionEngine/tests/CompositionEngineTest.cpp
@@ -30,6 +30,7 @@ namespace { using ::testing::_; +using ::testing::DoAll; using ::testing::InSequence; using ::testing::Ref; using ::testing::Return;