| commit | 7e11f72de39ebc9cb2fb095a516335e57dc32834 | [log] [tgz] |
|---|---|---|
| author | Haibo Huang <hhb@google.com> | Mon May 20 10:38:12 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Mon May 20 10:38:12 2019 -0700 |
| tree | 944c2bb54cf8198d495db3c1a0fb3c83f87539b7 | |
| parent | 0359dd9498260b19820346ac3e2cf0e210b9ec36 [diff] | |
| parent | 036b111df5e0f73236a6abe8d59aae0ea28d217d [diff] |
Merge "Using ::testing::DoAll" am: 036b111df5 Change-Id: I6faeae5b66284330827559216398c0cb58a981c0
diff --git a/services/surfaceflinger/tests/fakehwc/SFFakeHwc_test.cpp b/services/surfaceflinger/tests/fakehwc/SFFakeHwc_test.cpp index 9b31985..28cac2e 100644 --- a/services/surfaceflinger/tests/fakehwc/SFFakeHwc_test.cpp +++ b/services/surfaceflinger/tests/fakehwc/SFFakeHwc_test.cpp
@@ -54,10 +54,11 @@ namespace { // Mock test helpers +using ::testing::_; +using ::testing::DoAll; using ::testing::Invoke; using ::testing::Return; using ::testing::SetArgPointee; -using ::testing::_; using Transaction = SurfaceComposerClient::Transaction;