ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Load default prop from /system/etc/prop.default" into oc-dr1-dev

Browse source
This commit is contained in:
TreeHugger Robot 2017-06-28 06:28:07 +00:00 • committed by Android (Google) Code Review
commit d334d69b70
2 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
init/property_service.cpp
View file

@ -443,7 +443,7 @@ static void handle_property_set_fd() {
} }
} }
static void load_properties_from_file(const char *, const char *); static bool load_properties_from_file(const char *, const char *);
/* /*
* Filter is used to decide which properties to load: NULL loads all keys, * Filter is used to decide which properties to load: NULL loads all keys,
@ -507,17 +507,18 @@ static void load_properties(char *data, const char *filter)
// Filter is used to decide which properties to load: NULL loads all keys, // Filter is used to decide which properties to load: NULL loads all keys,
// "ro.foo.*" is a prefix match, and "ro.foo.bar" is an exact match. // "ro.foo.*" is a prefix match, and "ro.foo.bar" is an exact match.
static void load_properties_from_file(const char* filename, const char* filter) { static bool load_properties_from_file(const char* filename, const char* filter) {
Timer t; Timer t;
std::string data; std::string data;
std::string err; std::string err;
if (!ReadFile(filename, &data, &err)) { if (!ReadFile(filename, &data, &err)) {
PLOG(WARNING) << "Couldn't load property file: " << err; PLOG(WARNING) << "Couldn't load property file: " << err;
return; return false;
} }
data.push_back('\n'); data.push_back('\n');
load_properties(&data[0], filter); load_properties(&data[0], filter);
LOG(VERBOSE) << "(Loading properties from " << filename << " took " << t << ".)"; LOG(VERBOSE) << "(Loading properties from " << filename << " took " << t << ".)";
return true;
} }
static void load_persistent_properties() { static void load_persistent_properties() {
@ -592,7 +593,13 @@ static void update_sys_usb_config() {
} }
void property_load_boot_defaults() { void property_load_boot_defaults() {
load_properties_from_file("/default.prop", NULL); if (!load_properties_from_file("/system/etc/prop.default", NULL)) {
// Try recovery path
if (!load_properties_from_file("/prop.default", NULL)) {
// Try legacy path
load_properties_from_file("/default.prop", NULL);
}
}
load_properties_from_file("/odm/default.prop", NULL); load_properties_from_file("/odm/default.prop", NULL);
load_properties_from_file("/vendor/default.prop", NULL); load_properties_from_file("/vendor/default.prop", NULL);

3
libcutils/fs_config.cpp
View file

@ -134,7 +134,8 @@ static const struct fs_path_config android_files[] = {
{ 00640, AID_ROOT, AID_SHELL, 0, "data/nativetest64/tests.txt" }, { 00640, AID_ROOT, AID_SHELL, 0, "data/nativetest64/tests.txt" },
{ 00750, AID_ROOT, AID_SHELL, 0, "data/nativetest/*" }, { 00750, AID_ROOT, AID_SHELL, 0, "data/nativetest/*" },
{ 00750, AID_ROOT, AID_SHELL, 0, "data/nativetest64/*" }, { 00750, AID_ROOT, AID_SHELL, 0, "data/nativetest64/*" },
{ 00600, AID_ROOT, AID_ROOT, 0, "default.prop" }, { 00600, AID_ROOT, AID_ROOT, 0, "default.prop" }, // legacy
{ 00600, AID_ROOT, AID_ROOT, 0, "system/etc/prop.default" },
{ 00600, AID_ROOT, AID_ROOT, 0, "odm/build.prop" }, { 00600, AID_ROOT, AID_ROOT, 0, "odm/build.prop" },
{ 00600, AID_ROOT, AID_ROOT, 0, "odm/default.prop" }, { 00600, AID_ROOT, AID_ROOT, 0, "odm/default.prop" },
{ 00444, AID_ROOT, AID_ROOT, 0, odm_conf_dir + 1 }, { 00444, AID_ROOT, AID_ROOT, 0, odm_conf_dir + 1 },