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

Commit 5f21a5e4 authored by chaviw's avatar chaviw
Browse files

Add synchronous transaction to wait for setInputWindow to complete (1/n) 

Add SurfaceFlinger callback to notify when input windows have been set.

The call to set input windows from SF to InputDispatcher is one way.
Therefore, it won't wait to ensure the windows have been set. Add a
callback method to allow InputDispatcher to notify SF when it's finished
setting the input windows, allowing SF to block if needed.

Bug: 123041491
Test: Builds and runs
Change-Id: Ia4196d2e517c07d94ab9da71beab057d5d6fcf1c
parent 7caa828e

libs/gui/ISurfaceComposer.cpp

+11 −0
Original line number Diff line number Diff line
@@ -806,6 +806,12 @@ public: 
        }

        return error;

    }



    virtual void setInputWindowsFinished() {

        Parcel data, reply;

        data.writeInterfaceToken(ISurfaceComposer::getInterfaceDescriptor());

        remote()->transact(BnSurfaceComposer::SET_INPUT_WINDOWS_FINISHED, data, &reply);

    }

};



// Out-of-line virtual method definition to trigger vtable emission in this
@@ -1317,6 +1323,11 @@ status_t BnSurfaceComposer::onTransact( 
            }

            return removeRegionSamplingListener(listener);

        }

        case SET_INPUT_WINDOWS_FINISHED: {

            CHECK_INTERFACE(ISurfaceComposer, data, reply);

            setInputWindowsFinished();

            return NO_ERROR;

        }

        default: {

            return BBinder::onTransact(code, data, reply, flags);

        }

libs/gui/include/gui/ISurfaceComposer.h

+4 −0
Original line number Diff line number Diff line
@@ -359,6 +359,8 @@ public: 
     * Removes a listener that was streaming median luma updates from SurfaceFlinger.

     */

    virtual status_t removeRegionSamplingListener(const sp<IRegionSamplingListener>& listener) = 0;



    virtual void setInputWindowsFinished() = 0;

};



// ----------------------------------------------------------------------------
@@ -406,6 +408,8 @@ public: 
        GET_PHYSICAL_DISPLAY_IDS,

        ADD_REGION_SAMPLING_LISTENER,

        REMOVE_REGION_SAMPLING_LISTENER,

        SET_INPUT_WINDOWS_FINISHED,



        // Always append new enum to the end.

    };

libs/gui/tests/Surface_test.cpp

+2 −0
Original line number Diff line number Diff line
@@ -679,6 +679,8 @@ public: 
        return NO_ERROR;

    }



    void setInputWindowsFinished() override {}



protected:

    IBinder* onAsBinder() override { return nullptr; }

services/surfaceflinger/SurfaceFlinger.cpp

+4 −1
Original line number Diff line number Diff line
@@ -5154,7 +5154,8 @@ status_t SurfaceFlinger::CheckTransactCodeCredentials(uint32_t code) { 
        case GET_COLOR_MANAGEMENT:

        case GET_COMPOSITION_PREFERENCE:

        case GET_PROTECTED_CONTENT_SUPPORT:

        case IS_WIDE_COLOR_DISPLAY: {

        case IS_WIDE_COLOR_DISPLAY:

        case SET_INPUT_WINDOWS_FINISHED: {

            return OK;

        }

        case CAPTURE_LAYERS:
@@ -5887,6 +5888,8 @@ status_t SurfaceFlinger::captureScreenImplLocked(const RenderArea& renderArea, 
    return NO_ERROR;

}



void SurfaceFlinger::setInputWindowsFinished() {}



// ---------------------------------------------------------------------------



void SurfaceFlinger::State::traverseInZOrder(const LayerVector::Visitor& visitor) const {

services/surfaceflinger/SurfaceFlinger.h

+1 −0
Original line number Diff line number Diff line
@@ -479,6 +479,7 @@ private: 
    status_t addRegionSamplingListener(const Rect& samplingArea, const sp<IBinder>& stopLayerHandle,

                                       const sp<IRegionSamplingListener>& listener) override;

    status_t removeRegionSamplingListener(const sp<IRegionSamplingListener>& listener) override;

    void setInputWindowsFinished() override;

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

     * DeathRecipient interface

     */