Merge "Remove /default.prop" am: f464e6e0ac am: 362543a898

Change-Id: I844d0c22f6d9eb8c952f6023f9e5d1edd231ec8e
This commit is contained in:
Treehugger Robot 2020-05-16 09:11:34 +00:00 committed by Automerger Merge Worker
commit b705732fa7

View file

@ -886,10 +886,6 @@ void PropertyLoadBootDefaults() {
load_properties_from_file("/prop.default", 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_ext/build.prop", nullptr, &properties);