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

Commit c8610386 authored by Robert Carr's avatar Robert Carr Committed by android-build-merger
Browse files

Fix seamless rotation with SurfaceView WM bypass. 

am: cae605cd

Change-Id: I3e8fbbfcad28b53505516e85706e64fd54cecea1
parents 9a6870bb cae605cd

include/gui/ISurfaceComposerClient.h

+0 −4
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ public: 
        DestroySurface,

        ClearLayerFrameStats,

        GetLayerFrameStats,

        GetTransformToDisplayInverse,

        Last,

    };
@@ -76,9 +75,6 @@ public: 
     * Requires ACCESS_SURFACE_FLINGER permission

     */

    virtual status_t getLayerFrameStats(const sp<IBinder>& handle, FrameStats* outStats) const = 0;



    virtual status_t getTransformToDisplayInverse(const sp<IBinder>& handle,

                                                  bool* outTransformToDisplayInverse) const = 0;

};



class BnSurfaceComposerClient : public SafeBnInterface<ISurfaceComposerClient> {

include/gui/SurfaceComposerClient.h

+0 −3
Original line number Diff line number Diff line
@@ -169,9 +169,6 @@ public: 
    status_t clearLayerFrameStats(const sp<IBinder>& token) const;

    status_t getLayerFrameStats(const sp<IBinder>& token, FrameStats* outStats) const;



    status_t getTransformToDisplayInverse(const sp<IBinder>& token,

            bool* outTransformToDisplayInverse) const;



    static status_t clearAnimationFrameStats();

    static status_t getAnimationFrameStats(FrameStats* outStats);

include/gui/SurfaceControl.h

+0 −2
Original line number Diff line number Diff line
@@ -119,8 +119,6 @@ public: 
    status_t clearLayerFrameStats() const;

    status_t getLayerFrameStats(FrameStats* outStats) const;



    status_t getTransformToDisplayInverse(bool* outTransformToDisplayInverse) const;



private:

    // can't be copied

    SurfaceControl& operator = (SurfaceControl& rhs);

libs/gui/ISurfaceComposerClient.cpp

+0 −11
Original line number Diff line number Diff line
@@ -68,14 +68,6 @@ public: 
                &ISurfaceComposerClient::getLayerFrameStats)>(Tag::GetLayerFrameStats, handle,

                                                              outStats);

    }



    status_t getTransformToDisplayInverse(const sp<IBinder>& handle,

                                          bool* outTransformToDisplayInverse) const override {

        return callRemote<decltype(

                &ISurfaceComposerClient::

                        getTransformToDisplayInverse)>(Tag::GetTransformToDisplayInverse, handle,

                                                       outTransformToDisplayInverse);

    }

};



// Out-of-line virtual method definition to trigger vtable emission in this
@@ -105,9 +97,6 @@ status_t BnSurfaceComposerClient::onTransact(uint32_t code, const Parcel& data, 
        case Tag::GetLayerFrameStats: {

            return callLocal(data, reply, &ISurfaceComposerClient::getLayerFrameStats);

        }

        case Tag::GetTransformToDisplayInverse: {

            return callLocal(data, reply, &ISurfaceComposerClient::getTransformToDisplayInverse);

        }

        case Tag::Last:

            // Should not be possible because of the check at the beginning of the method

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

libs/gui/SurfaceComposerClient.cpp

+0 −8
Original line number Diff line number Diff line
@@ -711,14 +711,6 @@ status_t SurfaceComposerClient::getLayerFrameStats(const sp<IBinder>& token, 
    return mClient->getLayerFrameStats(token, outStats);

}



status_t SurfaceComposerClient::getTransformToDisplayInverse(const sp<IBinder>& token,

        bool* outTransformToDisplayInverse) const {

    if (mStatus != NO_ERROR) {

        return mStatus;

    }

    return mClient->getTransformToDisplayInverse(token, outTransformToDisplayInverse);

}



inline Composer& SurfaceComposerClient::getComposer() {

    return mComposer;

}