summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiyong Park <jiyong@google.com>2020-06-11 19:41:54 +0900
committerJiyong Park <jiyong@google.com>2020-06-11 19:45:14 +0900
commit5de946f4833cda99df15608aa2c84c951818f568 (patch)
tree8fa1fe388a10357098d8beb0c4644a7042323a53
parent7db723c2f975df4c1989c3beb1b90bbe533a927d (diff)
Fix a misleading warning message about sysprop overriding
Regardless of whether a system property is "ro." or not, it can be overridden by build.prop from the more specific partition. i.e. foo.bar=true in system/build.prop can be overridden by foo.bar=false in vendor/build.prop. However, the warning message was referring the overridden property as "ro." causing confusion when reading the log. Fix it by not mentioning "ro.". Bug: 117892318 Test: N/A Change-Id: I13014522d0c6b507b30c8754e2087fd71cc39971
-rw-r--r--init/property_service.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/init/property_service.cpp b/init/property_service.cpp
index 82f5b8c5db..612854d80f 100644
--- a/init/property_service.cpp
+++ b/init/property_service.cpp
@@ -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 {