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

Commit 9473d9d2 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Ensure libgui classes that are held by sp<> are only constructed with sp<>::make." into main

parents 34313a34 c1b4af37

libs/gui/include/gui/BufferQueueProducer.h

+3 −2
Original line number Diff line number Diff line
@@ -36,8 +36,6 @@ class BufferQueueProducer : public BnGraphicBufferProducer { 
public:

    friend class BufferQueue; // Needed to access binderDied



    explicit BufferQueueProducer(const sp<BufferQueueCore>& core,

                                 bool consumerIsSurfaceFlinger = false);

    ~BufferQueueProducer() override;



    // requestBuffer returns the GraphicBuffer for slot N.
@@ -219,6 +217,9 @@ public: 
#endif



protected:

    explicit BufferQueueProducer(const sp<BufferQueueCore>& core,

                                 bool consumerIsSurfaceFlinger = false);

    friend class sp<BufferQueueProducer>;

    // see IGraphicsBufferProducer::setMaxDequeuedBufferCount, but with the ability to retrieve the

    // total maximum buffer count for the buffer queue (dequeued AND acquired)

    status_t setMaxDequeuedBufferCount(int maxDequeuedBuffers, int* maxBufferCount);

libs/gui/include/gui/Choreographer.h

+4 −2
Original line number Diff line number Diff line
@@ -79,8 +79,6 @@ public: 
    };

    static Context gChoreographers;



    explicit Choreographer(const sp<Looper>& looper, const sp<IBinder>& layerHandle = nullptr)

            EXCLUDES(gChoreographers.lock);

    void postFrameCallbackDelayed(AChoreographer_frameCallback cb,

                                  AChoreographer_frameCallback64 cb64,

                                  AChoreographer_vsyncCallback vsyncCallback, void* data,
@@ -113,6 +111,10 @@ public: 


private:

    Choreographer(const Choreographer&) = delete;

    explicit Choreographer(const sp<Looper>& looper, const sp<IBinder>& layerHandle = nullptr)

            EXCLUDES(gChoreographers.lock);

    friend class sp<Choreographer>;

    friend AChoreographer* AChoreographer_create();



    void dispatchVsync(nsecs_t timestamp, PhysicalDisplayId displayId, uint32_t count,

                       VsyncEventData vsyncEventData) override;

libs/gui/include/gui/DisplayEventDispatcher.h

+8 −6
Original line number Diff line number Diff line
@@ -23,12 +23,6 @@ using FrameRateOverride = DisplayEventReceiver::Event::FrameRateOverride; 


class DisplayEventDispatcher : public LooperCallback {

public:

    explicit DisplayEventDispatcher(const sp<Looper>& looper,

                                    gui::ISurfaceComposer::VsyncSource vsyncSource =

                                            gui::ISurfaceComposer::VsyncSource::eVsyncSourceApp,

                                    EventRegistrationFlags eventRegistration = {},

                                    const sp<IBinder>& layerHandle = nullptr);



    status_t initialize();

    void dispose();

    status_t scheduleVsync();
@@ -38,6 +32,14 @@ public: 
    status_t getLatestVsyncEventData(ParcelableVsyncEventData* outVsyncEventData) const;



protected:

    explicit DisplayEventDispatcher(const sp<Looper>& looper,

                                    gui::ISurfaceComposer::VsyncSource vsyncSource =

                                            gui::ISurfaceComposer::VsyncSource::eVsyncSourceApp,

                                    EventRegistrationFlags eventRegistration = {},

                                    const sp<IBinder>& layerHandle = nullptr);



    friend class sp<DisplayEventDispatcher>;



    virtual ~DisplayEventDispatcher() = default;



private:

libs/gui/include/gui/WindowInfosListenerReporter.h

+3 −0
Original line number Diff line number Diff line
@@ -40,6 +40,9 @@ public: 
    void reconnect(const sp<gui::ISurfaceComposer>&);



private:

    WindowInfosListenerReporter() = default;

    friend class sp<WindowInfosListenerReporter>;



    std::mutex mListenersMutex;

    std::unordered_set<sp<gui::WindowInfosListener>, gui::SpHash<gui::WindowInfosListener>>

            mWindowInfosListeners GUARDED_BY(mListenersMutex);