| commit | d37cb7d9a7c1c9a0e2df92df0d7fa6495fd6d222 | [log] [tgz] |
|---|---|---|
| author | Haibo Huang <hhb@google.com> | Mon Sep 14 18:33:21 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 14 18:33:21 2020 +0000 |
| tree | 15786a58462abe2a43bb9516446e71dca173568b | |
| parent | 9336d6924869dae9521789b124e87bea71630fb4 [diff] | |
| parent | c9c9a268e6939e3295aceac33f203723aaeacc7a [diff] |
Merge "Using DoAll" am: c9c9a268e6 Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1425470 Change-Id: I2e07f490c5be5acfc65e0fa249e11442fa29d89a
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;