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

Commit 41ab5558 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 6449986 from 1b8793a6 to rvc-release 

Change-Id: Ia4e739092d4c0aa8adc67c4e715ecf74efaa04fc
parents 236cb1ab 1b8793a6

opengl/libs/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -75,7 +75,6 @@ cc_defaults { 
        "bionic_libc_platform_headers",

        "gl_headers",

        "libsystem_headers",

        "libhardware_headers",

        "libnativebase_headers",

    ],

    export_header_lib_headers: ["gl_headers"],

opengl/libs/EGL/egl.cpp

+0 −2
Original line number Diff line number Diff line
@@ -16,8 +16,6 @@ 


#include <stdlib.h>



#include <hardware/gralloc.h>



#include <EGL/egl.h>



#include <cutils/properties.h>

opengl/libs/EGL/egl_platform_entries.cpp

+0 −2
Original line number Diff line number Diff line
@@ -23,8 +23,6 @@ 
#include <stdlib.h>

#include <string.h>



#include <hardware/gralloc1.h>



#include <EGL/egl.h>

#include <EGL/eglext.h>

#include <EGL/eglext_angle.h>

services/surfaceflinger/SurfaceFlinger.cpp

+13 −5
Original line number Diff line number Diff line
@@ -3420,18 +3420,26 @@ void SurfaceFlinger::applyTransactionState( 
                                                  : Scheduler::TransactionStart::NORMAL;

        setTransactionFlags(transactionFlags, start);



        if (flags & eAnimation) {

            mAnimTransactionPending = true;

        }



        // if this is a synchronous transaction, wait for it to take effect

        // before returning.

        if (flags & eSynchronous) {

            mTransactionPending = true;

        const bool synchronous = flags & eSynchronous;

        const bool syncInput = inputWindowCommands.syncInputWindows;

        if (!synchronous && !syncInput) {

            return;

        }

        if (flags & eAnimation) {

            mAnimTransactionPending = true;



        if (synchronous) {

            mTransactionPending = true;

        }

        if (mPendingInputWindowCommands.syncInputWindows) {

        if (syncInput) {

            mPendingSyncInputWindows = true;

        }





        // applyTransactionState can be called by either the main SF thread or by

        // another process through setTransactionState.  While a given process may wish

        // to wait on synchronous transactions, the main SF thread should never