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

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

Merge "SF: Add thread saftey static analysis for InputWindowCommands"

parents b34d8a11 fa5f8df1

services/surfaceflinger/SurfaceFlinger.h

+6 −6
Original line number Diff line number Diff line
@@ -534,11 +534,11 @@ private: 
    void handleMessageRefresh();



    void handleTransaction(uint32_t transactionFlags);

    void handleTransactionLocked(uint32_t transactionFlags);

    void handleTransactionLocked(uint32_t transactionFlags) REQUIRES(mStateLock);



    void updateInputFlinger();

    void updateInputWindowInfo();

    void commitInputWindowCommands();

    void commitInputWindowCommands() REQUIRES(mStateLock);

    void executeInputWindowCommands();

    void updateCursorAsync();
@@ -567,7 +567,8 @@ private: 
                                       const Vector<ComposerState>& states);

    uint32_t setClientStateLocked(const ComposerState& composerState);

    uint32_t setDisplayStateLocked(const DisplayState& s);

    uint32_t addInputWindowCommands(const InputWindowCommands& inputWindowCommands);

    uint32_t addInputWindowCommands(const InputWindowCommands& inputWindowCommands)

            REQUIRES(mStateLock);



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

     * Layer management
@@ -1145,9 +1146,8 @@ private: 
    /* ------------------------------------------------------------------------ */

    sp<IInputFlinger> mInputFlinger;



    // Access must be protected by mStateLock.

    InputWindowCommands mPendingInputWindowCommands;

    // Should only be accessed by the drawing thread.

    InputWindowCommands mPendingInputWindowCommands GUARDED_BY(mStateLock);

    // Should only be accessed by the main thread.

    InputWindowCommands mInputWindowCommands;



    ui::DisplayPrimaries mInternalDisplayPrimaries;

services/surfaceflinger/tests/unittests/TestableSurfaceFlinger.h

+1 −0
Original line number Diff line number Diff line
@@ -234,6 +234,7 @@ public: 
    }



    auto handleTransactionLocked(uint32_t transactionFlags) {

        Mutex::Autolock _l(mFlinger->mStateLock);

        return mFlinger->handleTransactionLocked(transactionFlags);

    }