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

Commit ce5d0cc3 authored by Vishnu Nair's avatar Vishnu Nair
Browse files

SurfaceFlinger: Avoid calling to SystemServer with lock held 

Added missing case when setting inputinfo
see 14167e00 for more details

Bug: 124281288
Test: Existing tests pass
Change-Id: Ief2ccf8d2720a5d44f2c3fdaca7354789e2e5586
parent fce78ba2

services/surfaceflinger/SurfaceFlinger.cpp

+1 −1
Original line number Diff line number Diff line
@@ -3992,7 +3992,7 @@ uint32_t SurfaceFlinger::setClientStateLocked(const ComposerState& composerState 
        if (layer->setSidebandStream(s.sidebandStream)) flags |= eTraversalNeeded;

    }

    if (what & layer_state_t::eInputInfoChanged) {

        if (callingThreadHasUnscopedSurfaceFlingerAccess()) {

        if (privileged) {

            layer->setInputInfo(s.inputInfo);

            flags |= eTraversalNeeded;

        } else {

services/surfaceflinger/SurfaceFlinger.h

+3 −2
Original line number Diff line number Diff line
@@ -585,8 +585,9 @@ private: 
    bool containsAnyInvalidClientState(const Vector<ComposerState>& states);

    bool transactionIsReadyToBeApplied(int64_t desiredPresentTime,

                                       const Vector<ComposerState>& states);

    uint32_t setClientStateLocked(const ComposerState& composerState, bool privileged);

    uint32_t setDisplayStateLocked(const DisplayState& s);

    uint32_t setClientStateLocked(const ComposerState& composerState, bool privileged)

            REQUIRES(mStateLock);

    uint32_t setDisplayStateLocked(const DisplayState& s) REQUIRES(mStateLock);

    uint32_t addInputWindowCommands(const InputWindowCommands& inputWindowCommands)

            REQUIRES(mStateLock);

services/surfaceflinger/tests/unittests/TestableSurfaceFlinger.h

+4 −1
Original line number Diff line number Diff line
@@ -257,7 +257,10 @@ public: 
        return mFlinger->onHotplugReceived(sequenceId, display, connection);

    }



    auto setDisplayStateLocked(const DisplayState& s) { return mFlinger->setDisplayStateLocked(s); }

    auto setDisplayStateLocked(const DisplayState& s) {

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

        return mFlinger->setDisplayStateLocked(s);

    }



    // Allow reading display state without locking, as if called on the SF main thread.

    auto onInitializeDisplays() NO_THREAD_SAFETY_ANALYSIS {