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

Commit 6baa5930 authored by Patrick Williams's avatar Patrick Williams Committed by Android (Google) Code Review
Browse files

Merge "Revert "Fix DisplayState sanitization."" into main

parents db32303a b3daf1a1

libs/gui/ISurfaceComposer.cpp

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




    status_t setTransactionState(

    status_t setTransactionState(

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

            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,

            InputWindowCommands commands, int64_t desiredPresentTime, bool isAutoTimestamp,

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

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

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

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

libs/gui/SurfaceComposerClient.cpp

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

    uncacheBuffer.token = BufferCache::getInstance().getToken();

    uncacheBuffer.id = cacheId;

    uncacheBuffer.id = cacheId;

    Vector<ComposerState> composerStates;

    Vector<ComposerState> composerStates;

    Vector<DisplayState> displayStates;

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

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

                                              ISurfaceComposer::eOneWay,

                                              ISurfaceComposer::eOneWay,

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

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

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

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

libs/gui/include/gui/ISurfaceComposer.h

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

    /* open/close transactions. requires ACCESS_SURFACE_FLINGER permission */

    virtual status_t setTransactionState(

    virtual status_t setTransactionState(

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

            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,

            InputWindowCommands inputWindowCommands, int64_t desiredPresentTime,

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

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

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

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

libs/gui/tests/Surface_test.cpp

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




    status_t setTransactionState(

    status_t setTransactionState(

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

            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*/,

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

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

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

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

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

services/surfaceflinger/SurfaceFlinger.cpp

+2 −2
Original line number Original line Diff line number Diff line
@@ -5168,7 +5168,7 @@ bool SurfaceFlinger::shouldLatchUnsignaled(const layer_state_t& state, size_t nu 




status_t SurfaceFlinger::setTransactionState(

status_t SurfaceFlinger::setTransactionState(

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

        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,

        InputWindowCommands inputWindowCommands, int64_t desiredPresentTime, bool isAutoTimestamp,

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

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

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

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

        composerState.state.sanitize(permissions);

    }

    }





    for (DisplayState& display : displays) {

    for (DisplayState display : displays) {

        display.sanitize(permissions);

        display.sanitize(permissions);

    }

    }