openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Log failed load_properties_from_file calls." am: 57513bd5a3 am: 9abb85ebe0 am: 6d60731271 

am: 5c54bb548a

Change-Id: Ie392c70cd6117fcdb7f36dd0bd77f59f56e846bc
This commit is contained in:
Elliott Hughes 2016-10-01 01:25:48 +00:00 committed by android-build-merger
parent 44a305a13d 5c54bb548a
commit 082b4efc41
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
init/property_service.cpp
View File

@ -376,17 +376,17 @@ 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.
*/
// 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 void load_properties_from_file(const char* filename, const char* filter) {
Timer t;
std::string data;
if (read_file(filename, &data)) {
data.push_back('\n');
load_properties(&data[0], filter);
if (!read_file(filename, &data)) {
PLOG(WARNING) << "Couldn't load properties from " << filename;
return;
}
data.push_back('\n');
load_properties(&data[0], filter);
LOG(VERBOSE) << "(Loading properties from " << filename << " took " << t.duration() << "s.)";
}