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

Commit 988d829e authored by Patrick Williams's avatar Patrick Williams Committed by Android Build Coastguard Worker
Browse files

Revert "Fix DisplayState sanitization." 

This reverts commit 4e8200dec484fd6e5873f2a89c0b314467034eef.

Reason for revert: b/352098820
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:37b340fe19fa66c730ea8733f4db65457a4f9f68)
Merged-In: I4c421170d8788891d4b2304ee658d4b666bd9bc5
Change-Id: I4c421170d8788891d4b2304ee658d4b666bd9bc5
parent 95c97926

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
@@ -113,7 +113,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
@@ -4502,7 +4502,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,
@@ -4517,7 +4517,7 @@ status_t SurfaceFlinger::setTransactionState( 
        composerState.state.sanitize(permissions);

    }



    for (DisplayState& display : displays) {

    for (DisplayState display : displays) {

        display.sanitize(permissions);

    }