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

Merge changes from topic "remove_default_prop" am: a782da9b3e

Browse source 
Change-Id: Icdc97a1e365c0acdb5e320aa87d3bb9afda7c2a0
This commit is contained in:
Treehugger Robot 2020-05-15 02:35:03 +00:00 • committed by Automerger Merge Worker
commit 50a558fb4e
2 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
init/property_service.cpp
View file

@ -877,18 +877,19 @@ static void property_derive_build_fingerprint() {
} }
void PropertyLoadBootDefaults() { void PropertyLoadBootDefaults() {
// TODO(b/117892318): merge prop.default and build.prop files into one
// We read the properties and their values into a map, in order to always allow properties // We read the properties and their values into a map, in order to always allow properties
// loaded in the later property files to override the properties in loaded in the earlier // loaded in the later property files to override the properties in loaded in the earlier
// property files, regardless of if they are "ro." properties or not. // property files, regardless of if they are "ro." properties or not.
std::map<std::string, std::string> properties; std::map<std::string, std::string> properties;
if (!load_properties_from_file("/system/etc/prop.default", nullptr, &properties)) {
// Try recovery path if (IsRecoveryMode()) {
if (!load_properties_from_file("/prop.default", nullptr, &properties)) { load_properties_from_file("/prop.default", nullptr, &properties);
// Try legacy path
load_properties_from_file("/default.prop", nullptr, &properties);
}
} }
// Try legacy (non-Treble) path. This file might not exist in most of the
// post-Oreo devices. Absence of the file is not an error.
load_properties_from_file("/default.prop", nullptr, &properties);
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);

4
init/util_test.cpp
View file

@ -61,8 +61,8 @@ TEST(util, ReadFileWorldWiteable) {
TEST(util, ReadFileSymbolicLink) { TEST(util, ReadFileSymbolicLink) {
errno = 0; errno = 0;
// lrw------- 1 root root 23 2008-12-31 19:00 default.prop -> system/etc/prop.default // lrwxr-xr-x 1 root shell 6 2009-01-01 09:00 /system/bin/ps -> toybox
auto file_contents = ReadFile("/default.prop"); auto file_contents = ReadFile("/system/bin/ps");
EXPECT_EQ(ELOOP, errno); EXPECT_EQ(ELOOP, errno);
ASSERT_FALSE(file_contents.ok()); ASSERT_FALSE(file_contents.ok());
EXPECT_EQ("open() failed: Too many symbolic links encountered", EXPECT_EQ("open() failed: Too many symbolic links encountered",