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

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

release-request-148314be-b6e7-4b4d-b50e-ab6405ef3c8a-for-git_oc-dr1-release-39... 

release-request-148314be-b6e7-4b4d-b50e-ab6405ef3c8a-for-git_oc-dr1-release-3968906 snap-temp-L55700000060028590

Change-Id: I2767442fb259265d18ab2d61ded7e9a2f669f5e8
parents 545848e8 8a6c3c6a

cmds/installd/dexopt.cpp

+5 −7
Original line number Diff line number Diff line
@@ -1149,8 +1149,8 @@ Dex2oatFileWrapper maybe_open_reference_profile(const std::string& pkgname, 
// Opens the vdex files and assigns the input fd to in_vdex_wrapper_fd and the output fd to

// out_vdex_wrapper_fd. Returns true for success or false in case of errors.

bool open_vdex_files(const char* apk_path, const char* out_oat_path, int dexopt_needed,

        const char* instruction_set, bool is_public, bool profile_guided,

        int uid, bool is_secondary_dex, Dex2oatFileWrapper* in_vdex_wrapper_fd,

        const char* instruction_set, bool is_public, int uid, bool is_secondary_dex,

        Dex2oatFileWrapper* in_vdex_wrapper_fd,

        Dex2oatFileWrapper* out_vdex_wrapper_fd) {

    CHECK(in_vdex_wrapper_fd != nullptr);

    CHECK(out_vdex_wrapper_fd != nullptr);
@@ -1160,9 +1160,7 @@ bool open_vdex_files(const char* apk_path, const char* out_oat_path, int dexopt_ 
    int dexopt_action = abs(dexopt_needed);

    bool is_odex_location = dexopt_needed < 0;

    std::string in_vdex_path_str;

    // Disable passing an input vdex when the compilation is profile-guided. The dexlayout

    // optimization in dex2oat is incompatible with it. b/35872504.

    if (dexopt_action != DEX2OAT_FROM_SCRATCH && !profile_guided) {

    if (dexopt_action != DEX2OAT_FROM_SCRATCH) {

        // Open the possibly existing vdex. If none exist, we pass -1 to dex2oat for input-vdex-fd.

        const char* path = nullptr;

        if (is_odex_location) {
@@ -1523,8 +1521,8 @@ int dexopt(const char* dex_path, uid_t uid, const char* pkgname, const char* ins 
    // Open vdex files.

    Dex2oatFileWrapper in_vdex_fd;

    Dex2oatFileWrapper out_vdex_fd;

    if (!open_vdex_files(dex_path, out_oat_path, dexopt_needed, instruction_set, is_public,

            profile_guided, uid, is_secondary_dex, &in_vdex_fd, &out_vdex_fd)) {

    if (!open_vdex_files(dex_path, out_oat_path, dexopt_needed, instruction_set, is_public, uid,

            is_secondary_dex, &in_vdex_fd, &out_vdex_fd)) {

        return -1;

    }

include/gui/BufferQueueConsumer.h

+6 −0
Original line number Diff line number Diff line
@@ -129,6 +129,12 @@ public: 
    // enumerated in gralloc.h, e.g. GRALLOC_USAGE_HW_RENDER; the default is 0.

    virtual status_t setConsumerUsageBits(uint32_t usage);



    // setConsumerIsProtected will turn on an internal bit that indicates whether

    // the consumer can handle protected gralloc buffers (i.e. with

    // GRALLOC_USAGE_PROTECTED set). IGraphicBufferProducer can query this

    // capability using NATIVE_WINDOW_CONSUMER_IS_PROTECTED.

    virtual status_t setConsumerIsProtected(bool isProtected);



    // setTransformHint bakes in rotation to buffers so overlays can be used.

    // The values are enumerated in window.h, e.g.

    // NATIVE_WINDOW_TRANSFORM_ROT_90.  The default is 0 (no transform).

include/gui/BufferQueueCore.h

+4 −0
Original line number Diff line number Diff line
@@ -172,6 +172,10 @@ private: 
    // GraphicBuffers.

    uint32_t mConsumerUsageBits;



    // mConsumerIsProtected indicates the consumer is ready to handle protected

    // buffer.

    bool mConsumerIsProtected;



    // mConnectedApi indicates the producer API that is currently connected

    // to this BufferQueue. It defaults to NO_CONNECTED_API, and gets updated

    // by the connect and disconnect methods.

include/gui/IGraphicBufferConsumer.h

+6 −0
Original line number Diff line number Diff line
@@ -243,6 +243,12 @@ public: 
    // Return of a value other than NO_ERROR means an unknown error has occurred.

    virtual status_t setConsumerUsageBits(uint32_t usage) = 0;



    // setConsumerIsProtected will turn on an internal bit that indicates whether

    // the consumer can handle protected gralloc buffers (i.e. with

    // GRALLOC_USAGE_PROTECTED set). IGraphicBufferProducer can query this

    // capability using NATIVE_WINDOW_CONSUMER_IS_PROTECTED.

    virtual status_t setConsumerIsProtected(bool isProtected) = 0;



    // setTransformHint bakes in rotation to buffers so overlays can be used. The values are

    // enumerated in window.h, e.g. NATIVE_WINDOW_TRANSFORM_ROT_90. The default is 0

    // (no transform).

libs/arect/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -23,5 +23,6 @@ ndk_headers { 
cc_library_static {

    name: "libarect",

    host_supported: true,

    vendor_available: true,

    export_include_dirs: ["include"],

}