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

Commit 3da6f353 authored by Dan Stoza's avatar Dan Stoza Committed by android-build-merger
Browse files

Merge changes I23e6f088,I800208e8,I55123a7a into oc-dr1-dev am: 607b5d1b 

am: 1042a228

Change-Id: I4c5e092f7119fb9a90e791dd31fbdb4f56b811cd
parents 53b2c53d 1042a228

services/surfaceflinger/Android.mk

+1 −1
Original line number Original line Diff line number Diff line
@@ -104,7 +104,7 @@ LOCAL_EXPORT_SHARED_LIBRARY_HEADERS := \ 
    libhidltransport \

    libhidltransport \

    libhwbinder

    libhwbinder





LOCAL_CFLAGS += -Wall -Werror -Wunused -Wunreachable-code

LOCAL_CFLAGS += -Wall -Werror -Wunused -Wunreachable-code -std=c++1z





include $(BUILD_SHARED_LIBRARY)

include $(BUILD_SHARED_LIBRARY)

services/surfaceflinger/SurfaceFlinger.cpp

+244 −296

File changed.

Preview size limit exceeded, changes collapsed.

services/surfaceflinger/SurfaceFlinger.h

+11 −0
Original line number Original line Diff line number Diff line
@@ -417,6 +417,14 @@ private: 
            int32_t minLayerZ, int32_t maxLayerZ,

            int32_t minLayerZ, int32_t maxLayerZ,

            bool yswap, bool useIdentityTransform, Transform::orientation_flags rotation);

            bool yswap, bool useIdentityTransform, Transform::orientation_flags rotation);





#ifdef USE_HWC2

    status_t captureScreenImplLocked(const sp<const DisplayDevice>& device,

                                     ANativeWindowBuffer* buffer, Rect sourceCrop,

                                     uint32_t reqWidth, uint32_t reqHeight, int32_t minLayerZ,

                                     int32_t maxLayerZ, bool useIdentityTransform,

                                     Transform::orientation_flags rotation, bool isLocalScreenshot,

                                     int* outSyncFd);

#else

    status_t captureScreenImplLocked(

    status_t captureScreenImplLocked(

            const sp<const DisplayDevice>& hw,

            const sp<const DisplayDevice>& hw,

            const sp<IGraphicBufferProducer>& producer,

            const sp<IGraphicBufferProducer>& producer,
@@ -424,6 +432,7 @@ private: 
            int32_t minLayerZ, int32_t maxLayerZ,

            int32_t minLayerZ, int32_t maxLayerZ,

            bool useIdentityTransform, Transform::orientation_flags rotation,

            bool useIdentityTransform, Transform::orientation_flags rotation,

            bool isLocalScreenshot);

            bool isLocalScreenshot);

#endif





    sp<StartBootAnimThread> mStartBootAnimThread = nullptr;

    sp<StartBootAnimThread> mStartBootAnimThread = nullptr;
@@ -695,6 +704,8 @@ private: 
    };

    };

    std::queue<CompositePresentTime> mCompositePresentTimes;

    std::queue<CompositePresentTime> mCompositePresentTimes;





    std::atomic<bool> mRefreshPending{false};



    /* ------------------------------------------------------------------------

    /* ------------------------------------------------------------------------

     * Feature prototyping

     * Feature prototyping

     */

     */