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

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

Snap for 4565898 from 207a2118 to pi-release 

Change-Id: Id6472866aa17835af1d73e04ce4c448f4f475e00
parents 02de9123 207a2118

init/init.cpp

+5 −2
Original line number Original line Diff line number Diff line
@@ -110,12 +110,15 @@ static void LoadBootScripts(ActionManager& action_manager, ServiceList& service_ 
        if (!parser.ParseConfig("/system/etc/init")) {

        if (!parser.ParseConfig("/system/etc/init")) {

            late_import_paths.emplace_back("/system/etc/init");

            late_import_paths.emplace_back("/system/etc/init");

        }

        }

        if (!parser.ParseConfig("/vendor/etc/init")) {

        if (!parser.ParseConfig("/product/etc/init")) {

            late_import_paths.emplace_back("/vendor/etc/init");

            late_import_paths.emplace_back("/product/etc/init");

        }

        }

        if (!parser.ParseConfig("/odm/etc/init")) {

        if (!parser.ParseConfig("/odm/etc/init")) {

            late_import_paths.emplace_back("/odm/etc/init");

            late_import_paths.emplace_back("/odm/etc/init");

        }

        }

        if (!parser.ParseConfig("/vendor/etc/init")) {

            late_import_paths.emplace_back("/vendor/etc/init");

        }

    } else {

    } else {

        parser.ParseConfig(bootscript);

        parser.ParseConfig(bootscript);

    }

    }

init/property_service.cpp

+1 −0
Original line number Original line Diff line number Diff line
@@ -641,6 +641,7 @@ void property_load_boot_defaults() { 
            load_properties_from_file("/default.prop", NULL);

            load_properties_from_file("/default.prop", NULL);

        }

        }

    }

    }

    load_properties_from_file("/product/build.prop", NULL);

    load_properties_from_file("/odm/default.prop", NULL);

    load_properties_from_file("/odm/default.prop", NULL);

    load_properties_from_file("/vendor/default.prop", NULL);

    load_properties_from_file("/vendor/default.prop", NULL);

libcutils/fs_config.cpp

+1 −0
Original line number Original line Diff line number Diff line
@@ -141,6 +141,7 @@ static const struct fs_path_config android_files[] = { 
    { 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 },

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

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

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

    { 00750, AID_ROOT,      AID_SHELL,     0, "sbin/fs_mgr" },

    { 00750, AID_ROOT,      AID_SHELL,     0, "sbin/fs_mgr" },

    { 00755, AID_ROOT,      AID_SHELL,     0, "system/bin/crash_dump32" },

    { 00755, AID_ROOT,      AID_SHELL,     0, "system/bin/crash_dump32" },

    { 00755, AID_ROOT,      AID_SHELL,     0, "system/bin/crash_dump64" },

    { 00755, AID_ROOT,      AID_SHELL,     0, "system/bin/crash_dump64" },

libsystem/OWNERS

0 → 100644
+2 −0
Original line number Original line Diff line number Diff line 
jessehall@google.com

olv@google.com

libsystem/include/system/graphics-base-v1.1.h

+8 −0
Original line number Original line Diff line number Diff line
@@ -16,8 +16,16 @@ typedef enum { 
    HAL_PIXEL_FORMAT_DEPTH_32F = 51,

    HAL_PIXEL_FORMAT_DEPTH_32F = 51,

    HAL_PIXEL_FORMAT_DEPTH_32F_STENCIL_8 = 52,

    HAL_PIXEL_FORMAT_DEPTH_32F_STENCIL_8 = 52,

    HAL_PIXEL_FORMAT_STENCIL_8 = 53,

    HAL_PIXEL_FORMAT_STENCIL_8 = 53,

    HAL_PIXEL_FORMAT_YCBCR_P010 = 54,

} android_pixel_format_v1_1_t;

} android_pixel_format_v1_1_t;





typedef enum {

    HAL_DATASPACE_BT2020_ITU =

        281411584,  // ((STANDARD_BT2020 | TRANSFER_SMPTE_170M) | RANGE_LIMITED)

    HAL_DATASPACE_BT2020_ITU_PQ =

        298188800,  // ((STANDARD_BT2020 | TRANSFER_ST2084) | RANGE_LIMITED)

} android_dataspace_v1_1_t;



#ifdef __cplusplus

#ifdef __cplusplus

}

}

#endif

#endif