diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2017-01-20 03:58:51 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-01-20 03:58:52 +0000 |
| commit | 8dbab358f01ed0957ff4d5b1c505981dfe93d5de (patch) | |
| tree | c659f78b59a17018b95a3e7f8673ade9a6e236f0 | |
| parent | 18044da57674dff66af818a05b70afdb51a11d05 (diff) | |
| parent | de21de7a420e5b946757f5abefb6e1dd6f1db2b1 (diff) | |
| download | core-8dbab358f01ed0957ff4d5b1c505981dfe93d5de.tar.gz core-8dbab358f01ed0957ff4d5b1c505981dfe93d5de.tar.bz2 core-8dbab358f01ed0957ff4d5b1c505981dfe93d5de.zip | |
Merge "Load default/build props from each partition"
| -rw-r--r-- | init/property_service.cpp | 3 | ||||
| -rw-r--r-- | libcutils/fs_config.c | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/init/property_service.cpp b/init/property_service.cpp index 498a5a103..72fcb5b80 100644 --- a/init/property_service.cpp +++ b/init/property_service.cpp @@ -439,6 +439,8 @@ static void load_persistent_properties() { void property_load_boot_defaults() { load_properties_from_file(PROP_PATH_RAMDISK_DEFAULT, NULL); + load_properties_from_file(PROP_PATH_ODM_DEFAULT, NULL); + load_properties_from_file(PROP_PATH_VENDOR_DEFAULT, NULL); } static void load_override_properties() { @@ -501,6 +503,7 @@ void load_recovery_id_prop() { void load_system_props() { load_properties_from_file(PROP_PATH_SYSTEM_BUILD, NULL); + load_properties_from_file(PROP_PATH_ODM_BUILD, NULL); load_properties_from_file(PROP_PATH_VENDOR_BUILD, NULL); load_properties_from_file(PROP_PATH_FACTORY, "ro.*"); load_recovery_id_prop(); diff --git a/libcutils/fs_config.c b/libcutils/fs_config.c index 594b23def..b701bbaae 100644 --- a/libcutils/fs_config.c +++ b/libcutils/fs_config.c @@ -197,7 +197,10 @@ static const struct fs_path_config android_files[] = { { 00640, AID_ROOT, AID_SHELL, 0, "fstab.*" }, { 00600, AID_ROOT, AID_ROOT, 0, "system/build.prop" }, { 00600, AID_ROOT, AID_ROOT, 0, "vendor/build.prop" }, + { 00600, AID_ROOT, AID_ROOT, 0, "odm/build.prop" }, { 00600, AID_ROOT, AID_ROOT, 0, "default.prop" }, + { 00600, AID_ROOT, AID_ROOT, 0, "vendor/default.prop" }, + { 00600, AID_ROOT, AID_ROOT, 0, "odm/default.prop" }, { 00644, AID_ROOT, AID_ROOT, 0, 0 }, }; |