commit 3346338919caef7861860ecef74795e9188817e0
author Hung-ying Tyan <tyanh@google.com> Thu May 25 19:18:17 2017 +0800
committer Hung-ying Tyan <tyanh@google.com> Thu May 25 19:18:17 2017 +0800
tree 9102292715052f1bc4af222644454e8196f0a29d
parent a9aa77d25998626e7f62fa240532aa5e954e4396

Revert "Load {default,build}.prop from /{system,vendor,odm}/etc/"

This reverts commit 723f1a2b318a455983d21ccf3598885f766bb8c9.

Bug: 62075509

init/property_service.cpp

diff --git a/init/property_service.cpp b/init/property_service.cpp
index 7fa37c8..18e47e3 100644
--- a/init/property_service.cpp
+++ b/init/property_service.cpp
@@ -443,7 +443,7 @@
     }
 }
 
-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,
@@ -507,18 +507,17 @@
 
 // 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;
     std::string err;
     if (!ReadFile(filename, &data, &err)) {
-        PLOG(WARNING) << "Couldn't load property file: " << filename << ": " << err;
-        return false;
+        PLOG(WARNING) << "Couldn't load property file: " << err;
+        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,21 +592,16 @@
 }
 
 void property_load_boot_defaults() {
-    if (!load_properties_from_file("/system/etc/prop.default", nullptr)) {
-        // for legacy devices
-        if (!load_properties_from_file("/default.prop", nullptr)) {
-            PLOG(ERROR) << "Failed to load default prop";
-        }
-    }
-    load_properties_from_file("/odm/etc/prop.default", nullptr);
-    load_properties_from_file("/vendor/etc/prop.default", nullptr);
+    load_properties_from_file("/default.prop", NULL);
+    load_properties_from_file("/odm/default.prop", NULL);
+    load_properties_from_file("/vendor/default.prop", NULL);
 
     update_sys_usb_config();
 }
 
 static void load_override_properties() {
     if (ALLOW_LOCAL_PROP_OVERRIDE) {
-        load_properties_from_file("/data/local.prop", nullptr);
+        load_properties_from_file("/data/local.prop", NULL);
     }
 }
 
@@ -655,15 +649,9 @@
 }
 
 void load_system_props() {
-    if (!load_properties_from_file("/system/etc/prop.build", nullptr)) {
-        // for legacy devices
-        load_properties_from_file("/system/build.prop", nullptr);
-    }
-    load_properties_from_file("/odm/etc/prop.build", nullptr);
-    if (!load_properties_from_file("/vendor/etc/prop.build", nullptr)) {
-        // for legacy devices
-        load_properties_from_file("/vendor/build.prop", nullptr);
-    }
+    load_properties_from_file("/system/build.prop", NULL);
+    load_properties_from_file("/odm/build.prop", NULL);
+    load_properties_from_file("/vendor/build.prop", NULL);
     load_properties_from_file("/factory/factory.prop", "ro.*");
     load_recovery_id_prop();
 }