diff options
| author | Yabin Cui <yabinc@google.com> | 2020-03-18 17:27:44 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2020-03-18 17:27:44 +0000 |
| commit | 0b9f8de9be1e37c735d7cf58ad93b851e06a3a83 (patch) | |
| tree | edab3b2b5dd1670c6554ca706d2d4dca62d4d744 | |
| parent | 852a3e198ac87a03d473dae5fa2ba6163ac16c55 (diff) | |
| parent | 6c03e04df7ed218ea4d227ac847587827f19594e (diff) | |
| download | extras-android-r-preview-2.tar.gz | |
Merge "simpleperf: fix flaky record_native_app test."android-r-preview-4android-r-preview-3android-r-preview-2
| -rw-r--r-- | simpleperf/cmd_record_test.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/simpleperf/cmd_record_test.cpp b/simpleperf/cmd_record_test.cpp index c6bc3f22..0879f955 100644 --- a/simpleperf/cmd_record_test.cpp +++ b/simpleperf/cmd_record_test.cpp @@ -892,12 +892,10 @@ TEST(record_cmd, record_native_app) { // 4. Check perf.data. auto process_symbol = [&](const char* name) { -#if !defined(IN_CTS_TEST) const char* expected_name_with_keyguard = "NativeActivity"; // when screen is locked if (strstr(name, expected_name_with_keyguard) != nullptr) { return true; } -#endif const char* expected_name = "PlayScene::DoFrame"; // when screen is awake return strstr(name, expected_name) != nullptr; }; |