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

Commit 1648d4c1 authored by Mathias Agopian's avatar Mathias Agopian
Browse files

put back the unused virtuals in Vector<> 

some binaries are using these private APIs and broke
(as they should!) with this change. Temporarily restore the
virtuals to work around this.

Bug: 6977550
Change-Id: I7c37f24b16e4d586b89205c493db5169cf87e024
parent 317357fd

include/utils/VectorImpl.h

+20 −0
Original line number Diff line number Diff line
@@ -105,6 +105,16 @@ protected: 
    virtual void            do_move_forward(void* dest, const void* from, size_t num) const = 0;

    virtual void            do_move_backward(void* dest, const void* from, size_t num) const = 0;



    // take care of FBC...

    virtual void            reservedVectorImpl1();

    virtual void            reservedVectorImpl2();

    virtual void            reservedVectorImpl3();

    virtual void            reservedVectorImpl4();

    virtual void            reservedVectorImpl5();

    virtual void            reservedVectorImpl6();

    virtual void            reservedVectorImpl7();

    virtual void            reservedVectorImpl8();

    

private:

        void* _grow(size_t where, size_t amount);

        void  _shrink(size_t where, size_t amount);
@@ -155,6 +165,16 @@ public: 
protected:

    virtual int             do_compare(const void* lhs, const void* rhs) const = 0;



    // take care of FBC...

    virtual void            reservedSortedVectorImpl1();

    virtual void            reservedSortedVectorImpl2();

    virtual void            reservedSortedVectorImpl3();

    virtual void            reservedSortedVectorImpl4();

    virtual void            reservedSortedVectorImpl5();

    virtual void            reservedSortedVectorImpl6();

    virtual void            reservedSortedVectorImpl7();

    virtual void            reservedSortedVectorImpl8();



private:

            ssize_t         _indexOrderOf(const void* item, size_t* order = 0) const;

libs/utils/VectorImpl.cpp

+19 −0
Original line number Diff line number Diff line
@@ -494,6 +494,15 @@ void VectorImpl::_do_move_backward(void* dest, const void* from, size_t num) con 
    do_move_backward(dest, from, num);

}



void VectorImpl::reservedVectorImpl1() { }

void VectorImpl::reservedVectorImpl2() { }

void VectorImpl::reservedVectorImpl3() { }

void VectorImpl::reservedVectorImpl4() { }

void VectorImpl::reservedVectorImpl5() { }

void VectorImpl::reservedVectorImpl6() { }

void VectorImpl::reservedVectorImpl7() { }

void VectorImpl::reservedVectorImpl8() { }



/*****************************************************************************/



SortedVectorImpl::SortedVectorImpl(size_t itemSize, uint32_t flags)
@@ -609,6 +618,16 @@ ssize_t SortedVectorImpl::remove(const void* item) 
    return i;

}



void SortedVectorImpl::reservedSortedVectorImpl1() { };

void SortedVectorImpl::reservedSortedVectorImpl2() { };

void SortedVectorImpl::reservedSortedVectorImpl3() { };

void SortedVectorImpl::reservedSortedVectorImpl4() { };

void SortedVectorImpl::reservedSortedVectorImpl5() { };

void SortedVectorImpl::reservedSortedVectorImpl6() { };

void SortedVectorImpl::reservedSortedVectorImpl7() { };

void SortedVectorImpl::reservedSortedVectorImpl8() { };





/*****************************************************************************/



}; // namespace android