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

Commit b621c5f0 authored by Brian C. Anderson's avatar Brian C. Anderson Committed by Android (Google) Code Review
Browse files

Merge "Clean up Fence a little."

parents 90b25ed5 175a7206

include/gui/BufferQueueConsumer.h

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 


#include <gui/BufferQueueDefs.h>

#include <gui/IGraphicBufferConsumer.h>

#include <utils/String8.h>



namespace android {

include/ui/Fence.h

+9 −12
Original line number Diff line number Diff line
@@ -18,21 +18,17 @@ 
#define ANDROID_FENCE_H



#include <stdint.h>

#include <sys/types.h>



#include <ui/ANativeObjectBase.h>

#include <ui/PixelFormat.h>

#include <ui/Rect.h>

#include <utils/Flattenable.h>

#include <utils/String8.h>

#include <utils/RefBase.h>

#include <utils/Timers.h>



#include <experimental/optional>



struct ANativeWindowBuffer;



namespace android {



class String8;



// ===========================================================================

// Fence

// ===========================================================================
@@ -62,6 +58,12 @@ public: 
    // closed.

    explicit Fence(int fenceFd);



    // Not copyable or movable.

    Fence(const Fence& rhs) = delete;

    Fence& operator=(const Fence& rhs) = delete;

    Fence(Fence&& rhs) = delete;

    Fence& operator=(Fence&& rhs) = delete;



    // Check whether the Fence has an open fence file descriptor. Most Fence

    // methods treat an invalid file descriptor just like a valid fence that

    // is already signalled, so using this is usually not necessary.
@@ -135,11 +137,6 @@ private: 
    friend class LightRefBase<Fence>;

    ~Fence();



    // Disallow copying

    Fence(const Fence& rhs);

    Fence& operator = (const Fence& rhs);

    const Fence& operator = (const Fence& rhs) const;



    int mFenceFd;

};

libs/gui/FrameTimestamps.cpp

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 


#include <cutils/compiler.h>  // For CC_[UN]LIKELY

#include <inttypes.h>

#include <utils/Log.h>

#include <utils/String8.h>



#include <algorithm>

libs/gui/IGraphicBufferConsumer.cpp

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 


#include <utils/Errors.h>

#include <utils/NativeHandle.h>

#include <utils/String8.h>



#include <binder/Parcel.h>

#include <binder/IInterface.h>

libs/gui/IGraphicBufferProducer.cpp

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
#include <utils/Errors.h>

#include <utils/NativeHandle.h>

#include <utils/RefBase.h>

#include <utils/String8.h>

#include <utils/Timers.h>

#include <utils/Vector.h>