diff options
| author | Divya Sharma <divyash@codeaurora.org> | 2018-02-27 08:32:05 -0800 |
|---|---|---|
| committer | Divya Sharma <divyash@codeaurora.org> | 2018-02-27 08:32:05 -0800 |
| commit | 4e4914b22b779e6376bb00ae20636175b2a70d8c (patch) | |
| tree | f4ebc5eae2c99e20aceefcc9ffc3de19782f0fbe /cmds/statsd/tests/LogEntryMatcher_test.cpp | |
| parent | dbed40a3cd31af821ea99c605664908d67df2747 (diff) | |
| parent | ed5d4d06907844e1c87a6ee17c4f2868a8cc6d56 (diff) | |
PPR1.180219.001_AOSP_Merge
Conflicts:
core/res/res/values/config.xml
core/res/res/values/symbols.xml
packages/SystemUI/res/values/config.xml
packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java
packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java
telecomm/java/android/telecom/Call.java
telecomm/java/android/telecom/Connection.java
telecomm/java/android/telecom/ConnectionService.java
Change-Id: I524d38a61608069028b3496a189118d8eff75f4b
Diffstat (limited to 'cmds/statsd/tests/LogEntryMatcher_test.cpp')
| -rw-r--r-- | cmds/statsd/tests/LogEntryMatcher_test.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/cmds/statsd/tests/LogEntryMatcher_test.cpp b/cmds/statsd/tests/LogEntryMatcher_test.cpp index 111b4ba7a32c..1023ea40aa55 100644 --- a/cmds/statsd/tests/LogEntryMatcher_test.cpp +++ b/cmds/statsd/tests/LogEntryMatcher_test.cpp @@ -14,6 +14,7 @@ #include "frameworks/base/cmds/statsd/src/statsd_config.pb.h" #include "matchers/matcher_util.h" +#include "stats_log_util.h" #include "stats_util.h" #include <gtest/gtest.h> @@ -35,8 +36,6 @@ const int FIELD_ID_3 = 2; const int ATTRIBUTION_UID_FIELD_ID = 1; const int ATTRIBUTION_TAG_FIELD_ID = 2; -// Private API from liblog. -extern "C" void android_log_rewind(android_log_context ctx); #ifdef __ANDROID__ TEST(AtomMatcherTest, TestSimpleMatcher) { @@ -597,7 +596,6 @@ TEST(AtomMatcherTest, TestNorMatcher) { matcherResults.push_back(MatchingState::kMatched); EXPECT_FALSE(combinationMatch(children, operation, matcherResults)); } - #else GTEST_LOG_(INFO) << "This test does nothing.\n"; #endif |