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

Commit 05ae400a authored by Chih-hung Hsieh's avatar Chih-hung Hsieh Committed by android-build-merger
Browse files

Merge "Fix/suppress bootanimation google-explicit-constructor warnings" am: 50ee2201

am: b737b4fd

Change-Id: I6e34a9e6351f06d9015e8f061f6e4eb5d22ef391
parents b63e813f b737b4fd
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ public:
        virtual void shutdown() {}
    };

    BootAnimation(sp<Callbacks> callbacks);
    explicit BootAnimation(sp<Callbacks> callbacks);

    sp<SurfaceComposerClient> session() const;

@@ -127,7 +127,7 @@ private:

    class TimeCheckThread : public Thread {
    public:
        TimeCheckThread(BootAnimation* bootAnimation);
        explicit TimeCheckThread(BootAnimation* bootAnimation);
        virtual ~TimeCheckThread();
    private:
        virtual status_t    readyToRun();