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

Commit 7628ae28 authored by Doris Liu's avatar Doris Liu Committed by android-build-merger
Browse files

Merge \"Fix use-after-free in vector drawable animation\" into nyc-mr1-dev

am: 133ab104

Change-Id: Ice990efd5e8a2554c8a57b191e4d288971270919
parents 6de0295b 133ab104
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ public:
    virtual uint32_t dirtyMask();
    bool isInfinite() { return mIsInfinite; }
    void setVectorDrawable(VectorDrawableRoot* vd) { mVectorDrawable = vd; }
    VectorDrawableRoot* getVectorDrawable() const { return mVectorDrawable; }
    VectorDrawableRoot* getVectorDrawable() const { return mVectorDrawable.get(); }
    AnimationListener* getOneShotListener() { return mOneShotListener.get(); }
    void clearOneShotListener() { mOneShotListener = nullptr; }
    uint32_t getRequestId() const { return mRequestId; }
@@ -78,7 +78,7 @@ private:
    std::vector< std::unique_ptr<PropertyAnimator> > mAnimators;
    float mLastFraction = 0.0f;
    bool mInitialized = false;
    VectorDrawableRoot* mVectorDrawable = nullptr;
    sp<VectorDrawableRoot> mVectorDrawable;
    bool mIsInfinite = false;
    // This request id gets incremented (on UI thread only) when a new request to modfiy the
    // lifecycle of an animation happens, namely when start/end/reset/reverse is called.