diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-06-02 18:53:18 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-06-02 18:53:18 +0000 |
| commit | 6643fd8e76fa08aca18f2e846061878fb68fb048 (patch) | |
| tree | 866b7f197765c3acf8cc45aeb09652dea0938901 | |
| parent | b53b7a16d03bd95134fc9c28d2d42a33c79f6f05 (diff) | |
| parent | 5df4ef163e238a71f3a0332a4b68673332762ed7 (diff) | |
| download | StatsD-6643fd8e76fa08aca18f2e846061878fb68fb048.tar.gz | |
Merge "Skip flag queries on R devices" into sc-dev
| -rw-r--r-- | statsd/Android.bp | 1 | ||||
| -rw-r--r-- | statsd/src/flags/flags.cpp | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/statsd/Android.bp b/statsd/Android.bp index 5ab9c0ce..52a1abd4 100644 --- a/statsd/Android.bp +++ b/statsd/Android.bp @@ -92,6 +92,7 @@ cc_defaults { static_libs: [ "libbase", "libcutils", + "libmodules-utils-build", "libprotoutil", "libstatslog_statsd", "libsysutils", diff --git a/statsd/src/flags/flags.cpp b/statsd/src/flags/flags.cpp index e9fceda7..2252c7ea 100644 --- a/statsd/src/flags/flags.cpp +++ b/statsd/src/flags/flags.cpp @@ -16,6 +16,7 @@ #include "flags.h" +#include <android-modules-utils/sdk_level.h> #include <server_configurable_flags/get_flags.h> using server_configurable_flags::GetServerConfigurableFlag; @@ -26,6 +27,9 @@ namespace os { namespace statsd { string getFlagString(const string& flagName, const string& defaultValue) { + if (!android::modules::sdklevel::IsAtLeastS()) { + return defaultValue; + } return GetServerConfigurableFlag(STATSD_NATIVE_NAMESPACE, flagName, defaultValue); } |