Load /prop.default in recovery mode

Bug: 37815285
Bug: 62525809
Test: Tested with ag/2398663 and ag/2400523. Booted pixel phones,
      checked the location of prop.default, verified the symlink,
      checked a few properties via adb shell and manually tested
      a few apps.
      Booted to recovery and ran 'adb sideload' successfully.
Change-Id: I034b700fcd60b0104873131e94864b16ef4bd9f6
This commit is contained in:
Hung-ying Tyan 2017-06-13 12:50:13 +08:00
parent 12ea2d12ef
commit 75801ab5e3
1 changed files with 5 additions and 2 deletions

View File

@ -594,8 +594,11 @@ static void update_sys_usb_config() {
void property_load_boot_defaults() {
if (!load_properties_from_file("/system/etc/prop.default", NULL)) {
// legacy path
load_properties_from_file("/default.prop", NULL);
// Try recovery path
if (!load_properties_from_file("/prop.default", NULL)) {
// Try legacy path
load_properties_from_file("/default.prop", NULL);
}
}
load_properties_from_file("/odm/default.prop", NULL);
load_properties_from_file("/vendor/default.prop", NULL);