diff options
| author | Yabin Cui <yabinc@google.com> | 2020-03-25 01:21:59 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-03-25 01:21:59 +0000 |
| commit | ebf1f162facb8a06348f779975efeb7f8e91bfb5 (patch) | |
| tree | b810d088c643c01fc46e38b983d89ea5b40265ba | |
| parent | 5ccb4be1bdd87467f6a9b113c188e38bc3115360 (diff) | |
| parent | 63854bfa25cfdb538f7fdb1deeb3853e4ce3f5cc (diff) | |
| download | extras-ebf1f162facb8a06348f779975efeb7f8e91bfb5.tar.gz | |
Merge "simpleperf: fix flaky record_native_app test." into rvc-dev am: 63854bfa25
Change-Id: Icdd20e372ae10f30dbd0de31d545798e012c68cd
| -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; }; |