Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8569552e authored by Jiyong Park's avatar Jiyong Park
Browse files

/vendor/default.prop is removed. 

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
parent 5133bbfd

init/property_service.cpp

+8 −1
Original line number Original line Diff line number Diff line
@@ -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);



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