Merge "Fix a misleading warning message about sysprop overriding" am: 6c7b75b421

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1331393

Change-Id: Ic442e2745923b5c6f38525233d0cf9fe9d10de04
This commit is contained in:
Treehugger Robot 2020-06-11 15:03:04 +00:00 committed by Automerger Merge Worker
commit 1adcea5c84

View file

@ -711,8 +711,8 @@ static void LoadProperties(char* data, const char* filter, const char* filename,
if (it == properties->end()) {
(*properties)[key] = value;
} else if (it->second != value) {
LOG(WARNING) << "Overriding previous 'ro.' property '" << key << "':'"
<< it->second << "' with new value '" << value << "'";
LOG(WARNING) << "Overriding previous property '" << key << "':'" << it->second
<< "' with new value '" << value << "'";
it->second = value;
}
} else {