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

Change-Id: Ia792a5c68edbd93f99a2f9667bdce07e0eb5e327
This commit is contained in:
Treehugger Robot 2020-05-16 09:28:32 +00:00 committed by Automerger Merge Worker
commit c25c33480a

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);