summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--init/property_service.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/init/property_service.cpp b/init/property_service.cpp
index 7e11ff076..ce197eec1 100644
--- a/init/property_service.cpp
+++ b/init/property_service.cpp
@@ -575,16 +575,16 @@ static void load_persistent_properties() {
575} 575}
576 576
577void property_load_boot_defaults() { 577void property_load_boot_defaults() {
578 load_properties_from_file(PROP_PATH_RAMDISK_DEFAULT, NULL); 578 load_properties_from_file("/default.prop", NULL);
579 load_properties_from_file(PROP_PATH_ODM_DEFAULT, NULL); 579 load_properties_from_file("/odm/default.prop", NULL);
580 load_properties_from_file(PROP_PATH_VENDOR_DEFAULT, NULL); 580 load_properties_from_file("/vendor/default.prop", NULL);
581} 581}
582 582
583static void load_override_properties() { 583static void load_override_properties() {
584 if (ALLOW_LOCAL_PROP_OVERRIDE) { 584 if (ALLOW_LOCAL_PROP_OVERRIDE) {
585 std::string debuggable = property_get("ro.debuggable"); 585 std::string debuggable = property_get("ro.debuggable");
586 if (debuggable == "1") { 586 if (debuggable == "1") {
587 load_properties_from_file(PROP_PATH_LOCAL_OVERRIDE, NULL); 587 load_properties_from_file("/data/local.prop", NULL);
588 } 588 }
589 } 589 }
590} 590}
@@ -639,10 +639,10 @@ void load_recovery_id_prop() {
639} 639}
640 640
641void load_system_props() { 641void load_system_props() {
642 load_properties_from_file(PROP_PATH_SYSTEM_BUILD, NULL); 642 load_properties_from_file("/system/build.prop", NULL);
643 load_properties_from_file(PROP_PATH_ODM_BUILD, NULL); 643 load_properties_from_file("/odm/build.prop", NULL);
644 load_properties_from_file(PROP_PATH_VENDOR_BUILD, NULL); 644 load_properties_from_file("/vendor/build.prop", NULL);
645 load_properties_from_file(PROP_PATH_FACTORY, "ro.*"); 645 load_properties_from_file("/factory/factory.prop", "ro.*");
646 load_recovery_id_prop(); 646 load_recovery_id_prop();
647} 647}
648 648