diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2017-06-12 20:07:58 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2017-06-12 20:07:58 +0000 |
| commit | 07b94b5c74ed09414e583372c00f34ffe91e6adc (patch) | |
| tree | e4a0911ae8c23cfd5da8275ade9f20c2b7993c2b | |
| parent | ee2ad1dd4f5423f2d3704e0e00e091dc36bac1f4 (diff) | |
| parent | 154cf5b0bce0141db6f01efa1372d73c8cc613d7 (diff) | |
| download | core-07b94b5c74ed09414e583372c00f34ffe91e6adc.tar.gz | |
Merge cherrypicks of [2396133, 2396035, 2395977, 2395978] into oc-release
Change-Id: I68ba69d7159ebcc55bc66ff5fad9764c190448b1
| -rw-r--r-- | init/property_service.cpp | 12 | ||||
| -rw-r--r-- | libcutils/fs_config.c | 3 |
2 files changed, 5 insertions, 10 deletions
diff --git a/init/property_service.cpp b/init/property_service.cpp index 60c1895f1..5884cb60c 100644 --- a/init/property_service.cpp +++ b/init/property_service.cpp @@ -444,7 +444,7 @@ static void handle_property_set_fd() { } } -static bool load_properties_from_file(const char *, const char *); +static void load_properties_from_file(const char *, const char *); /* * Filter is used to decide which properties to load: NULL loads all keys, @@ -508,17 +508,16 @@ static void load_properties(char *data, const char *filter) // 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. -static bool load_properties_from_file(const char* filename, const char* filter) { +static void load_properties_from_file(const char* filename, const char* filter) { Timer t; std::string data; if (!read_file(filename, &data)) { PLOG(WARNING) << "Couldn't load properties from " << filename; - return false; + return; } data.push_back('\n'); load_properties(&data[0], filter); LOG(VERBOSE) << "(Loading properties from " << filename << " took " << t << ".)"; - return true; } static void load_persistent_properties() { @@ -593,10 +592,7 @@ static void update_sys_usb_config() { } void property_load_boot_defaults() { - if (!load_properties_from_file("/system/etc/prop.default", NULL)) { - // legacy path - load_properties_from_file("/default.prop", NULL); - } + load_properties_from_file("/default.prop", NULL); load_properties_from_file("/odm/default.prop", NULL); load_properties_from_file("/vendor/default.prop", NULL); diff --git a/libcutils/fs_config.c b/libcutils/fs_config.c index 5b9d17429..d98a923c9 100644 --- a/libcutils/fs_config.c +++ b/libcutils/fs_config.c @@ -135,8 +135,7 @@ static const struct fs_path_config android_files[] = { { 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/nativetest64/*" }, - { 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, "default.prop" }, { 00600, AID_ROOT, AID_ROOT, 0, "odm/build.prop" }, { 00600, AID_ROOT, AID_ROOT, 0, "odm/default.prop" }, { 00444, AID_ROOT, AID_ROOT, 0, odm_conf_dir + 1 }, |