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

Commit 714c63fc authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "SF: Remove setClientStateLocked hook"

parents 08a97163 48e09ef9

services/surfaceflinger/SurfaceFlinger.h

+6 −7
Original line number Diff line number Diff line
@@ -331,13 +331,6 @@ protected: 
    // We're reference counted, never destroy SurfaceFlinger directly

    virtual ~SurfaceFlinger();



    virtual uint32_t setClientStateLocked(

            const FrameTimelineInfo& info, const ComposerState& composerState,

            int64_t desiredPresentTime, bool isAutoTimestamp, int64_t postTime,

            uint32_t permissions,

            std::unordered_set<ListenerCallbacks, ListenerCallbacksHash>& listenerCallbacks)

            REQUIRES(mStateLock);



    virtual void processDisplayAdded(const wp<IBinder>& displayToken, const DisplayDeviceState&)

            REQUIRES(mStateLock);
@@ -733,6 +726,12 @@ private: 
    // Returns true if there is at least one transaction that needs to be flushed

    bool transactionFlushNeeded();



    uint32_t setClientStateLocked(const FrameTimelineInfo&, const ComposerState&,

                                  int64_t desiredPresentTime, bool isAutoTimestamp,

                                  int64_t postTime, uint32_t permissions,

                                  std::unordered_set<ListenerCallbacks, ListenerCallbacksHash>&)

            REQUIRES(mStateLock);



    uint32_t getTransactionFlags() const;



    // Sets the masked bits, and returns the old flags.