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

Commit b4bf96a4 authored by Patrick Williams's avatar Patrick Williams Committed by Automerger Merge Worker
Browse files

Revert "Fix DisplayState sanitization." am: 37b340fe 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/28365305



Change-Id: I56d27f7de453de7c33e36237474a27c3d92fe061
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a350e9e9 37b340fe

libs/gui/ISurfaceComposer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ public: 


    status_t setTransactionState(

            const FrameTimelineInfo& frameTimelineInfo, Vector<ComposerState>& state,

            Vector<DisplayState>& displays, uint32_t flags, const sp<IBinder>& applyToken,

            const Vector<DisplayState>& displays, uint32_t flags, const sp<IBinder>& applyToken,

            InputWindowCommands commands, int64_t desiredPresentTime, bool isAutoTimestamp,

            const std::vector<client_cache_t>& uncacheBuffers, bool hasListenerCallbacks,

            const std::vector<ListenerCallbacks>& listenerCallbacks, uint64_t transactionId,

libs/gui/SurfaceComposerClient.cpp

+1 −2
Original line number Diff line number Diff line
@@ -1047,8 +1047,7 @@ void SurfaceComposerClient::doUncacheBufferTransaction(uint64_t cacheId) { 
    uncacheBuffer.token = BufferCache::getInstance().getToken();

    uncacheBuffer.id = cacheId;

    Vector<ComposerState> composerStates;

    Vector<DisplayState> displayStates;

    status_t status = sf->setTransactionState(FrameTimelineInfo{}, composerStates, displayStates,

    status_t status = sf->setTransactionState(FrameTimelineInfo{}, composerStates, {},

                                              ISurfaceComposer::eOneWay,

                                              Transaction::getDefaultApplyToken(), {}, systemTime(),

                                              true, {uncacheBuffer}, false, {}, generateId(), {});

libs/gui/include/gui/ISurfaceComposer.h

+1 −1
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ public: 
    /* open/close transactions. requires ACCESS_SURFACE_FLINGER permission */

    virtual status_t setTransactionState(

            const FrameTimelineInfo& frameTimelineInfo, Vector<ComposerState>& state,

            Vector<DisplayState>& displays, uint32_t flags, const sp<IBinder>& applyToken,

            const Vector<DisplayState>& displays, uint32_t flags, const sp<IBinder>& applyToken,

            InputWindowCommands inputWindowCommands, int64_t desiredPresentTime,

            bool isAutoTimestamp, const std::vector<client_cache_t>& uncacheBuffer,

            bool hasListenerCallbacks, const std::vector<ListenerCallbacks>& listenerCallbacks,

libs/gui/tests/Surface_test.cpp

+1 −1
Original line number Diff line number Diff line
@@ -697,7 +697,7 @@ public: 


    status_t setTransactionState(

            const FrameTimelineInfo& /*frameTimelineInfo*/, Vector<ComposerState>& /*state*/,

            Vector<DisplayState>& /*displays*/, uint32_t /*flags*/,

            const Vector<DisplayState>& /*displays*/, uint32_t /*flags*/,

            const sp<IBinder>& /*applyToken*/, InputWindowCommands /*inputWindowCommands*/,

            int64_t /*desiredPresentTime*/, bool /*isAutoTimestamp*/,

            const std::vector<client_cache_t>& /*cachedBuffer*/, bool /*hasListenerCallbacks*/,

services/surfaceflinger/SurfaceFlinger.cpp

+2 −2
Original line number Diff line number Diff line
@@ -4507,7 +4507,7 @@ bool SurfaceFlinger::shouldLatchUnsignaled(const sp<Layer>& layer, const layer_s 


status_t SurfaceFlinger::setTransactionState(

        const FrameTimelineInfo& frameTimelineInfo, Vector<ComposerState>& states,

        Vector<DisplayState>& displays, uint32_t flags, const sp<IBinder>& applyToken,

        const Vector<DisplayState>& displays, uint32_t flags, const sp<IBinder>& applyToken,

        InputWindowCommands inputWindowCommands, int64_t desiredPresentTime, bool isAutoTimestamp,

        const std::vector<client_cache_t>& uncacheBuffers, bool hasListenerCallbacks,

        const std::vector<ListenerCallbacks>& listenerCallbacks, uint64_t transactionId,
@@ -4522,7 +4522,7 @@ status_t SurfaceFlinger::setTransactionState( 
        composerState.state.sanitize(permissions);

    }



    for (DisplayState& display : displays) {

    for (DisplayState display : displays) {

        display.sanitize(permissions);

    }