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

Commit 666a7bf6 authored by Huihong Luo's avatar Huihong Luo Committed by Android (Google) Code Review
Browse files

Merge "Remove vsync injection methods"

parents 1b07e1c6 d71299eb

libs/gui/SurfaceComposerClient.cpp

+0 −12
Original line number Diff line number Diff line
@@ -2237,18 +2237,6 @@ status_t SurfaceComposerClient::getLayerFrameStats(const sp<IBinder>& token, 


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



status_t SurfaceComposerClient::enableVSyncInjections(bool enable) {

    sp<gui::ISurfaceComposer> sf(ComposerServiceAIDL::getComposerService());

    binder::Status status = sf->enableVSyncInjections(enable);

    return statusTFromBinderStatus(status);

}



status_t SurfaceComposerClient::injectVSync(nsecs_t when) {

    sp<gui::ISurfaceComposer> sf(ComposerServiceAIDL::getComposerService());

    binder::Status status = sf->injectVSync(when);

    return statusTFromBinderStatus(status);

}



status_t SurfaceComposerClient::getDisplayState(const sp<IBinder>& display,

                                                ui::DisplayState* state) {

    gui::DisplayState ds;

libs/gui/aidl/android/gui/ISurfaceComposer.aidl

+0 −4
Original line number Diff line number Diff line
@@ -224,10 +224,6 @@ interface ISurfaceComposer { 
     */

    PullAtomData onPullAtom(int atomId);



    oneway void enableVSyncInjections(boolean enable);



    oneway void injectVSync(long when);



    /**

     * Gets the list of active layers in Z order for debugging purposes

     *

libs/gui/fuzzer/libgui_fuzzer_utils.h

+0 −2
Original line number Diff line number Diff line
@@ -102,8 +102,6 @@ public: 
    MOCK_METHOD(binder::Status, overrideHdrTypes, (const sp<IBinder>&, const std::vector<int32_t>&),

                (override));

    MOCK_METHOD(binder::Status, onPullAtom, (int32_t, gui::PullAtomData*), (override));

    MOCK_METHOD(binder::Status, enableVSyncInjections, (bool), (override));

    MOCK_METHOD(binder::Status, injectVSync, (int64_t), (override));

    MOCK_METHOD(binder::Status, getLayerDebugInfo, (std::vector<gui::LayerDebugInfo>*), (override));

    MOCK_METHOD(binder::Status, getColorManagement, (bool*), (override));

    MOCK_METHOD(binder::Status, getCompositionPreference, (gui::CompositionPreference*),

libs/gui/fuzzer/libgui_surfaceComposerClient_fuzzer.cpp

+0 −4
Original line number Diff line number Diff line
@@ -271,10 +271,6 @@ void SurfaceComposerClientFuzzer::invokeSurfaceComposerClient() { 
    sp<Surface> surfaceParent(

            new Surface(producer, mFdp.ConsumeBool() /*controlledByApp*/, handle));



    SurfaceComposerClient::enableVSyncInjections(mFdp.ConsumeBool() /*secure*/);

    nsecs_t when = mFdp.ConsumeIntegral<uint32_t>();

    SurfaceComposerClient::injectVSync(when);



    fuzzOnPullAtom();

    SurfaceComposerClient::setDisplayContentSamplingEnabled(displayToken,

                                                            mFdp.ConsumeBool() /*enable*/,

libs/gui/include/gui/SurfaceComposerClient.h

+0 −4
Original line number Diff line number Diff line
@@ -358,10 +358,6 @@ public: 
    //! Get token for a physical display given its stable ID

    static sp<IBinder> getPhysicalDisplayToken(PhysicalDisplayId displayId);



    static status_t enableVSyncInjections(bool enable);



    static status_t injectVSync(nsecs_t when);



    struct SCHash {

        std::size_t operator()(const sp<SurfaceControl>& sc) const {

            return std::hash<SurfaceControl *>{}(sc.get());