Do not read persist.device_config properties in flags
This was causing permission warnings in dexoptanalyzer. Let's disable
this for now until we can be sure to do it right.
Test: presubmit
Change-Id: I42828857b7db06d6cde47b57c5834ffb02f2f9a6
diff --git a/libartbase/base/flags.cc b/libartbase/base/flags.cc
index 68dc78f..4320c95 100644
--- a/libartbase/base/flags.cc
+++ b/libartbase/base/flags.cc
@@ -26,7 +26,6 @@
#pragma clang diagnostic error "-Wconversion"
namespace {
-constexpr const char* kServerConfigurableFlagsPrefix = "persist.device_config.runtime_native_boot.";
constexpr const char* kUndefinedValue = "UNSET";
// The various ParseValue functions store the parsed value into *destination. If parsing fails for
@@ -72,11 +71,6 @@
std::replace(command_line_argument_name_.begin(), command_line_argument_name_.end(), '.', '-');
system_property_name_ = "dalvik.vm." + name;
- std::string server_setting = name;
- std::replace(server_setting.begin(), server_setting.end(), '.', '_');
- std::replace(server_setting.begin(), server_setting.end(), '-', '_');
- server_setting_name_ = kServerConfigurableFlagsPrefix + server_setting;
-
ALL_FLAGS.push_front(this);
}
@@ -99,9 +93,6 @@
if (!initialized_) {
Reload();
}
- if (from_server_setting_.has_value()) {
- return from_server_setting_.value();
- }
if (from_system_property_.has_value()) {
return from_system_property_.value();
}
@@ -113,17 +104,6 @@
initialized_ = true;
// Command line argument cannot be reloaded. It must be set during initial command line parsing.
- // Check the server-side configuration
- from_server_setting_ = std::nullopt;
- // Read the device_config setting directly to avoid a dependency on server_configurable_flags.
- const std::string server_config =
- ::android::base::GetProperty(server_setting_name_, kUndefinedValue);
- if (server_config != kUndefinedValue) {
- ParseValue(server_config, &from_server_setting_);
- // Don't bother checking system properties if we have a server-configured value.
- return;
- }
-
// Check system properties
from_system_property_ = std::nullopt;
const std::string sysprop = ::android::base::GetProperty(system_property_name_, kUndefinedValue);
diff --git a/libartbase/base/flags.h b/libartbase/base/flags.h
index 66c0b3a..6dd5898 100644
--- a/libartbase/base/flags.h
+++ b/libartbase/base/flags.h
@@ -23,9 +23,8 @@
#include <variant>
// This file defines a set of flags that can be used to enable/disable features within ART or
-// otherwise tune ART's behavior. Flags can be set through command line options, server side
-// configuration, system properties, or default values. This flexibility enables easier development
-// and also larger experiments.
+// otherwise tune ART's behavior. Flags can be set through command line options, system properties,
+// or default values. This flexibility enables easier development and also larger experiments.
//
// The flags are defined in the Flags struct near the bottom of the file. To define a new flag, add
// a Flag field to the struct. Then to read the value of the flag, use gFlag.MyNewFlag().
@@ -70,7 +69,6 @@
std::string command_line_argument_name_;
std::string system_property_name_;
- std::string server_setting_name_;
virtual FlagValuePointer GetLocation() = 0;
};
@@ -99,8 +97,8 @@
// Returns the value of the flag or an empty option if it was not set.
std::optional<Value> GetOptional();
- // Reload the server-configured value and system property values. In general this should not be
- // used directly, but it can be used to support reloading the value without restarting the device.
+ // Reload the system property values. In general this should not be used directly, but it can be
+ // used to support reloading the value without restarting the device.
void Reload();
protected:
@@ -111,7 +109,6 @@
const Value default_;
std::optional<Value> from_command_line_;
std::optional<Value> from_system_property_;
- std::optional<Value> from_server_setting_;
};
// This struct contains the list of ART flags. Flags are parameterized by the type of value they
@@ -132,10 +129,6 @@
//
// -Xmetrics-write-to-log=true
//
-// Server Side Configuration:
-//
-// runtime_native_boot.metrics_write_to_log
-//
// System Property:
//
// setprop dalvik.vm.metrics.write-to-log true