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

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

Snap for 4716599 from 1f0622ed to pi-release 

Change-Id: Ifa61363054c57273921ea35979b04d7aecf74f51
parents 79ca7086 1f0622ed

cmds/lshal/ListCommand.cpp

+1 −1
Original line number Diff line number Diff line
@@ -503,7 +503,7 @@ Status ListCommand::fetchAllLibraries(const sp<IServiceManager> &manager) { 
    using namespace ::android::hidl::manager::V1_0;

    using namespace ::android::hidl::base::V1_0;

    using std::literals::chrono_literals::operator""s;

    auto ret = timeoutIPC(2s, manager, &IServiceManager::debugDump, [&] (const auto &infos) {

    auto ret = timeoutIPC(10s, manager, &IServiceManager::debugDump, [&] (const auto &infos) {

        std::map<std::string, TableEntry> entries;

        for (const auto &info : infos) {

            std::string interfaceName = std::string{info.interfaceName.c_str()} + "/" +

opengl/include/GLES2/gl2ext.h

+0 −11
Original line number Diff line number Diff line
@@ -3612,17 +3612,6 @@ GL_APICALL void GL_APIENTRY glEndTilingQCOM (GLbitfield preserveMask); 
#define GL_SHADER_BINARY_VIV              0x8FC4

#endif /* GL_VIV_shader_binary */



/* Temporary hack to allow frameworks/base/libs/hwui/debug to build.

 * This function was removed from the Khronos version of the headers

 * (it is specified with the EXT prefix, not OES). */

#ifndef GL_ANDROID_draw_elements_base_vertex_backwards_compatibility

#define GL_ANDROID_draw_elements_base_vertex_backwards_compatibility 1

typedef void (GL_APIENTRYP PFNGLMULTIDRAWELEMENTSBASEVERTEXOESPROC) (GLenum mode, const GLsizei *count, GLenum type, const void *const*indices, GLsizei primcount, const GLint *basevertex);

#ifdef GL_GLEXT_PROTOTYPES

GL_APICALL void GL_APIENTRY glMultiDrawElementsBaseVertexOES (GLenum mode, const GLsizei *count, GLenum type, const void *const*indices, GLsizei primcount, const GLint *basevertex);

#endif

#endif /* GL_ANDROID_draw_elements_base_vertex_backwards_compatibility */



#ifdef __cplusplus

}

#endif

services/surfaceflinger/SurfaceFlinger.cpp

+14 −11
Original line number Diff line number Diff line
@@ -1020,18 +1020,8 @@ void SurfaceFlinger::setActiveColorModeInternal(const sp<DisplayDevice>& hw, 
    int32_t type = hw->getDisplayType();

    ColorMode currentMode = hw->getActiveColorMode();

    Dataspace currentDataSpace = hw->getCompositionDataSpace();

    RenderIntent currentRenderIntent = hw->getActiveRenderIntent();



    if (mode == currentMode && dataSpace == currentDataSpace) {

        return;

    }



    if (type >= DisplayDevice::NUM_BUILTIN_DISPLAY_TYPES) {

        ALOGW("Trying to set config for virtual display");

        return;

    }



    hw->setActiveColorMode(mode);

    hw->setCompositionDataSpace(dataSpace);

    // Natural Mode means it's color managed and the color must be right,

    // thus we pick RenderIntent::COLORIMETRIC as render intent.

    // Native Mode means the display is not color managed, and whichever
@@ -1046,6 +1036,19 @@ void SurfaceFlinger::setActiveColorModeInternal(const sp<DisplayDevice>& hw, 
        hw->getDisplayType() == DisplayDevice::DISPLAY_PRIMARY) {

        renderIntent = RenderIntent::ENHANCE;

    }



    if (mode == currentMode && dataSpace == currentDataSpace &&

        renderIntent == currentRenderIntent) {

        return;

    }



    if (type >= DisplayDevice::NUM_BUILTIN_DISPLAY_TYPES) {

        ALOGW("Trying to set config for virtual display");

        return;

    }



    hw->setActiveColorMode(mode);

    hw->setCompositionDataSpace(dataSpace);

    hw->setActiveRenderIntent(renderIntent);

    getHwComposer().setActiveColorMode(type, mode, renderIntent);