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

/vendor/default.prop is removed.

Browse source 
It is merged to /vendor/build.prop. However, for backwards
compatibility, the old file is read on devices running R or earlier.

Bug: 117892318
Test: TH passes
Test: inspect  /vendor/build.prop and check if it has contents from
the old /vendor/default.prop file
Change-Id: I994cc85fc0765bc9233e9799bcb670a23180f068
This commit is contained in:
Jiyong Park 2020-05-11 15:59:44 +09:00
parent 5133bbfd34
commit 8569552ec2
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);