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

Commit 0f9e31a3 authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge 52e03def on remote branch 

Change-Id: I7a245210b0e250e45430f85b32f757c0bff49741
parents 2e9a7908 52e03def

libs/ui/Region.cpp

+5 −0
Original line number Diff line number Diff line
@@ -795,6 +795,11 @@ status_t Region::unflatten(void const* buffer, size_t size) { 
        return NO_MEMORY;

    }



    if (numRects > (UINT32_MAX / sizeof(Rect))) {

        android_errorWriteWithInfoLog(0x534e4554, "29983260", -1, NULL, 0);

        return NO_MEMORY;

    }



    Region result;

    result.mStorage.clear();

    for (size_t r = 0; r < numRects; ++r) {

vulkan/libvulkan/driver.cpp

+9 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include <new>

#include <malloc.h>

#include <sys/prctl.h>

#include <cutils/properties.h>



#include "driver.h"

#include "stubhal.h"
@@ -130,6 +131,14 @@ bool Hal::Open() { 
    hal_.dev_ = &stubhal::kDevice;



    const hwvulkan_module_t* module;



    // Use stub HAL if vulkan is disabled

    bool disableVulkan = property_get_bool("persist.graphics.vulkan.disable", false);

    if (disableVulkan == true) {

        ALOGI("no Vulkan HAL present, using stub HAL");

        return true;

    }



    int result =

        hw_get_module("vulkan", reinterpret_cast<const hw_module_t**>(&module));

    if (result != 0) {