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

Commit 101b4cc9 authored by Chih-Hung Hsieh's avatar Chih-Hung Hsieh Committed by android-build-merger
Browse files

Merge "Fix google-explicit-constructor warnings in surfaceflinger." 

am: 5e703a6a

Change-Id: I758fe34b9d89c5d2c343830d6521b7b2217cdbde
parents 67061703 5e703a6a

services/surfaceflinger/Client.h

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ class SurfaceFlinger; 
class Client : public BnSurfaceComposerClient

{

public:

        Client(const sp<SurfaceFlinger>& flinger);

        explicit Client(const sp<SurfaceFlinger>& flinger);

        ~Client();



    status_t initCheck() const;

services/surfaceflinger/Colorizer.h

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ public: 
        WHITE   = 37

    };



    Colorizer(bool enabled)

    explicit Colorizer(bool enabled)

        : mEnabled(enabled) {

    }

services/surfaceflinger/DispSync.h

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ public: 
        virtual void onDispSyncEvent(nsecs_t when) = 0;

    };



    DispSync(const char* name);

    explicit DispSync(const char* name);

    ~DispSync();



    // reset clears the resync samples and error value.

services/surfaceflinger/DisplayHardware/FloatRect.h

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


    inline FloatRect()

        : left(0), top(0), right(0), bottom(0) { }

    inline FloatRect(const Rect& other)

    inline FloatRect(const Rect& other)  // NOLINT(implicit)

        : left(other.left), top(other.top), right(other.right), bottom(other.bottom) { }



    inline float getWidth() const { return right - left; }

services/surfaceflinger/DisplayHardware/HWC2.h

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ typedef std::function<void(std::shared_ptr<Display>, nsecs_t)> VsyncCallback; 
class Device

{

public:

    Device(hwc2_device_t* device);

    explicit Device(hwc2_device_t* device);

    ~Device();



    friend class HWC2::Display;