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

Commit f2bfd0cf authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 5605988 from c6ca8237 to qt-release 

Change-Id: I186e524afca3c7d5f58ace2c567cb371b776ed68
parents 41634220 c6ca8237

init/property_service.cpp

+6 −2
Original line number Original line Diff line number Diff line
@@ -883,8 +883,12 @@ void property_load_boot_defaults(bool load_debug_prop) { 
    load_properties_from_file("/system/build.prop", nullptr, &properties);

    load_properties_from_file("/system/build.prop", nullptr, &properties);

    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__) {

        load_properties_from_file("/odm/etc/build.prop", nullptr, &properties);

    } 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("/product_services/build.prop", nullptr, &properties);

    load_properties_from_file("/product_services/build.prop", nullptr, &properties);

    load_properties_from_file("/factory/factory.prop", "ro.*", &properties);

    load_properties_from_file("/factory/factory.prop", "ro.*", &properties);

libcutils/fs_config.cpp

+3 −2
Original line number Original line Diff line number Diff line
@@ -159,8 +159,9 @@ static const struct fs_path_config android_files[] = { 
    { 00750, AID_ROOT,      AID_SHELL,     0, "data/nativetest64/*" },

    { 00750, AID_ROOT,      AID_SHELL,     0, "data/nativetest64/*" },

    { 00600, AID_ROOT,      AID_ROOT,      0, "default.prop" }, // legacy

    { 00600, AID_ROOT,      AID_ROOT,      0, "default.prop" }, // legacy

    { 00600, AID_ROOT,      AID_ROOT,      0, "system/etc/prop.default" },

    { 00600, AID_ROOT,      AID_ROOT,      0, "system/etc/prop.default" },

    { 00600, AID_ROOT,      AID_ROOT,      0, "odm/build.prop" },

    { 00600, AID_ROOT,      AID_ROOT,      0, "odm/build.prop" }, // legacy; only for P release

    { 00600, AID_ROOT,      AID_ROOT,      0, "odm/default.prop" },

    { 00600, AID_ROOT,      AID_ROOT,      0, "odm/default.prop" }, // legacy; only for P release

    { 00600, AID_ROOT,      AID_ROOT,      0, "odm/etc/build.prop" },

    { 00444, AID_ROOT,      AID_ROOT,      0, odm_conf_dir + 1 },

    { 00444, AID_ROOT,      AID_ROOT,      0, odm_conf_dir + 1 },

    { 00444, AID_ROOT,      AID_ROOT,      0, odm_conf_file + 1 },

    { 00444, AID_ROOT,      AID_ROOT,      0, odm_conf_file + 1 },

    { 00444, AID_ROOT,      AID_ROOT,      0, oem_conf_dir + 1 },

    { 00444, AID_ROOT,      AID_ROOT,      0, oem_conf_dir + 1 },

rootdir/init.rc

+0 −1
Original line number Original line Diff line number Diff line
@@ -586,7 +586,6 @@ on post-fs-data 
    symlink /data/data /data/user/0

    symlink /data/data /data/user/0





    mkdir /data/media 0770 media_rw media_rw

    mkdir /data/media 0770 media_rw media_rw

    mkdir /data/media/obb 0770 media_rw media_rw





    mkdir /data/cache 0770 system cache

    mkdir /data/cache 0770 system cache

    mkdir /data/cache/recovery 0770 system cache

    mkdir /data/cache/recovery 0770 system cache

sdcard/sdcard.cpp

+8 −1
Original line number Original line Diff line number Diff line
@@ -214,8 +214,15 @@ static void run_sdcardfs(const std::string& source_path, const std::string& labe 




    if (multi_user) {

    if (multi_user) {

        std::string obb_path = source_path + "/obb";

        std::string obb_path = source_path + "/obb";

        // Only attempt to prepare the /obb dir if it already exists. We want

        // the legacy obb path "/data/media/obb" to be fixed up so that we can

        // migrate it to its new location, but we don't want the directory to be

        // created if it doesn't already exist.

        struct stat sb;

        if (TEMP_FAILURE_RETRY(lstat(obb_path.c_str(), &sb)) == 0) {

            fs_prepare_dir(obb_path.c_str(), 0775, uid, gid);

            fs_prepare_dir(obb_path.c_str(), 0775, uid, gid);

        }

        }

    }





    exit(0);

    exit(0);

}

}