commit b737b4fdb393d4d6380e9a2685c2d823f6cade91
author Chih-hung Hsieh <chh@google.com> Wed Jan 02 11:49:48 2019 -0800
committer android-build-merger <android-build-merger@google.com> Wed Jan 02 11:49:48 2019 -0800
tree d408e0b5cd1d31ef65f315f39fb206ccb1a8a4ba
parent 36c3953339eee40aaddc6df3795d080d09328f96
parent 50ee2201269e27c092509a4e8861a3b5a6d6a3fd

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

Change-Id: Ic66073e57baef324a7b0bfe968b132418f95dcc7

cmds/bootanimation/BootAnimation.h

diff --git a/cmds/bootanimation/BootAnimation.h b/cmds/bootanimation/BootAnimation.h
index b4699d8..4fd5c0e 100644
--- a/cmds/bootanimation/BootAnimation.h
+++ b/cmds/bootanimation/BootAnimation.h
@@ -113,7 +113,7 @@
         virtual void shutdown() {}
     };
 
-    BootAnimation(sp<Callbacks> callbacks);
+    explicit BootAnimation(sp<Callbacks> callbacks);
 
     sp<SurfaceComposerClient> session() const;
 
@@ -127,7 +127,7 @@
 
     class TimeCheckThread : public Thread {
     public:
-        TimeCheckThread(BootAnimation* bootAnimation);
+        explicit TimeCheckThread(BootAnimation* bootAnimation);
         virtual ~TimeCheckThread();
     private:
         virtual status_t    readyToRun();