diff options
| author | Jeffrey Huang <jeffreyhuang@google.com> | 2021-05-21 12:30:44 -0700 |
|---|---|---|
| committer | Jeffrey Huang <jeffreyhuang@google.com> | 2021-05-25 10:11:31 -0700 |
| commit | 5df4ef163e238a71f3a0332a4b68673332762ed7 (patch) | |
| tree | a11e8fc90167b4f35d82d1fa39c948c6f521a4ac | |
| parent | f4e8b652703d4e855f6e22562ba5b9353b286e0e (diff) | |
| download | StatsD-5df4ef163e238a71f3a0332a4b68673332762ed7.tar.gz | |
Skip flag queries on R devices
Bug: 187857404
Test: manual via adb
Change-Id: Ia06d4998d285d968f9aea117e46833dad07b8074
Merged-In: Ia06d4998d285d968f9aea117e46833dad07b8074
| -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); } |