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

Commit 1b47dfd7 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes Ica5f5f5c,Ifb7d2cec,Ia402b4bc,I9c3b6b7e,I36ba19c7, ... into oc-dev 

* changes:
  libgui: Make IGraphicBufferConsumer a SafeInterface
  libbinder: Add vector<Parcelable> to SafeInterface
  libbinder: Add sp<NativeHandle> to SafeInterface
  libbinder: Support enums in SafeInterface
  libbinder: Support sp<Flattenable> in SafeInterface
  libbinder: Add int64_t/uint64_t to SafeInterface
  libgui: Normalize IGraphicBufferConsumer methods
  libgui: Format IGraphicBufferConsumer
parents 3a717993 4b5fbdb1

include/gui/BufferQueueConsumer.h

+3 −3
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ public: 
    virtual status_t setMaxAcquiredBufferCount(int maxAcquiredBuffers);



    // setConsumerName sets the name used in logging

    virtual void setConsumerName(const String8& name);

    status_t setConsumerName(const String8& name) override;



    // setDefaultBufferFormat allows the BufferQueue to create

    // GraphicBuffers of a defaultFormat if no format is specified
@@ -135,7 +135,7 @@ public: 
    virtual status_t setTransformHint(uint32_t hint);



    // Retrieve the sideband buffer stream, if any.

    virtual sp<NativeHandle> getSidebandStream() const;

    status_t getSidebandStream(sp<NativeHandle>* outStream) const override;



    // See IGraphicBufferConsumer::getOccupancyHistory

    virtual status_t getOccupancyHistory(bool forceFlush,
@@ -145,7 +145,7 @@ public: 
    virtual status_t discardFreeBuffers() override;



    // dump our state in a String

    virtual void dumpState(String8& result, const char* prefix) const;

    status_t dumpState(const String8& prefix, String8* outResult) const override;



    // Functions required for backwards compatibility.

    // These will be modified/renamed in IGraphicBufferConsumer and will be

include/gui/BufferQueueCore.h

+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ public: 


private:

    // Dump our state in a string

    void dumpState(String8& result, const char* prefix) const;

    void dumpState(const String8& prefix, String8* outResult) const;



    // getMinUndequeuedBufferCountLocked returns the minimum number of buffers

    // that must remain in a state other than DEQUEUED. The async parameter

include/gui/IGraphicBufferConsumer.h

+143 −159

File changed.

Preview size limit exceeded, changes collapsed.

libs/binder/include/binder/SafeInterface.h

+75 −1

File changed.

Preview size limit exceeded, changes collapsed.

libs/binder/tests/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -100,6 +100,7 @@ cc_test { 


    shared_libs: [

        "libbinder",

        "libcutils",

        "liblog",

        "libutils",

    ],