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

Commit 56425fd6 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 12773175 from b587a472 to 25Q2-release 

Change-Id: I561696706d11e149f015338e9892c7683aafacd1
parents d8a61736 b587a472

libs/binder/tests/binderLibTest.cpp

+6 −1
Original line number Diff line number Diff line
@@ -344,7 +344,12 @@ class BinderLibTest : public ::testing::Test { 
        }



        bool checkFreezeSupport() {

            std::ifstream freezer_file("/sys/fs/cgroup/uid_0/cgroup.freeze");

            std::string path;

            if (!CgroupGetAttributePathForTask("FreezerState", getpid(), &path)) {

                return false;

            }



            std::ifstream freezer_file(path);

            // Pass test on devices where the cgroup v2 freezer is not supported

            if (freezer_file.fail()) {

                return false;

libs/ui/GraphicBuffer.cpp

+2 −0
Original line number Diff line number Diff line
@@ -596,6 +596,8 @@ status_t GraphicBuffer::unflatten(void const*& buffer, size_t& size, int const*& 
            width = height = stride = format = usage_deprecated = 0;

            layerCount = 0;

            usage = 0;

            native_handle_close(handle);

            native_handle_delete(const_cast<native_handle_t*>(handle));

            handle = nullptr;

            ALOGE("unflatten: registerBuffer failed: %s (%d)", strerror(-err), err);

            return err;