ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

/vendor/default.prop is removed. am: 8569552ec2 am: cbdb311d35 am: 67c7244ae6

Browse source 
Change-Id: Ie4902bb17619e6c98b5fa7852898d19803bbdefa
This commit is contained in:
Jiyong Park 2020-05-15 03:11:13 +00:00 • committed by Automerger Merge Worker
commit 419180a768
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
init/property_service.cpp
View file

@ -891,14 +891,21 @@ void PropertyLoadBootDefaults() {
} }
load_properties_from_file("/system/build.prop", nullptr, &properties); load_properties_from_file("/system/build.prop", nullptr, &properties);
load_properties_from_file("/system_ext/build.prop", nullptr, &properties); load_properties_from_file("/system_ext/build.prop", nullptr, &properties);
load_properties_from_file("/vendor/default.prop", nullptr, &properties);
// TODO(b/117892318): uncomment the following condition when vendor.imgs for
// aosp_* targets are all updated.
// if (SelinuxGetVendorAndroidVersion() <= __ANDROID_API_R__) {
load_properties_from_file("/vendor/default.prop", nullptr, &properties);
// }
load_properties_from_file("/vendor/build.prop", nullptr, &properties); load_properties_from_file("/vendor/build.prop", nullptr, &properties);
if (SelinuxGetVendorAndroidVersion() >= __ANDROID_API_Q__) { if (SelinuxGetVendorAndroidVersion() >= __ANDROID_API_Q__) {
load_properties_from_file("/odm/etc/build.prop", nullptr, &properties); load_properties_from_file("/odm/etc/build.prop", nullptr, &properties);
} else { } else {
load_properties_from_file("/odm/default.prop", nullptr, &properties); load_properties_from_file("/odm/default.prop", nullptr, &properties);
load_properties_from_file("/odm/build.prop", nullptr, &properties); load_properties_from_file("/odm/build.prop", nullptr, &properties);
} }
load_properties_from_file("/product/build.prop", nullptr, &properties); load_properties_from_file("/product/build.prop", nullptr, &properties);
load_properties_from_file("/factory/factory.prop", "ro.*", &properties); load_properties_from_file("/factory/factory.prop", "ro.*", &properties);