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

Commit 585a5045 authored by John Reck's avatar John Reck Committed by android-build-merger
Browse files

Merge "Be quiet" into qt-dev 

am: 6297eced

Change-Id: I7891af97193daf87e6537eaf316ec95edfbf5261
parents 4f875921 6297eced

libs/hwui/pipeline/skia/SkiaOpenGLPipeline.cpp

+0 −2
Original line number Diff line number Diff line
@@ -166,8 +166,6 @@ static void setBufferCount(ANativeWindow* window, uint32_t extraBuffers) { 
    auto min_undequeued_buffers = static_cast<uint32_t>(query_value);



    int bufferCount = min_undequeued_buffers + 2 + extraBuffers;

    ALOGD("Setting buffer count to %d, min_undequeued %u, extraBuffers %u",

            bufferCount, min_undequeued_buffers, extraBuffers);

    native_window_set_buffer_count(window, bufferCount);

}

libs/hwui/renderthread/EglManager.cpp

+0 −3
Original line number Diff line number Diff line
@@ -235,8 +235,6 @@ bool EglManager::hasEglContext() { 
}



void EglManager::loadConfigs() {

    ALOGD("Swap behavior %d", static_cast<int>(mSwapBehavior));



    // Note: The default pixel format is RGBA_8888, when other formats are

    // available, we should check the target pixel format and configure the

    // attributes list properly.
@@ -246,7 +244,6 @@ void EglManager::loadConfigs() { 
            // Try again without dirty regions enabled

            ALOGW("Failed to choose config with EGL_SWAP_BEHAVIOR_PRESERVED, retrying without...");

            mSwapBehavior = SwapBehavior::Discard;

            ALOGD("Swap behavior %d", static_cast<int>(mSwapBehavior));

            mEglConfig = load8BitsConfig(mEglDisplay, mSwapBehavior);

        } else {

            // Failed to get a valid config