Merge "Fix/suppress bootanimation google-explicit-constructor warnings" am:... (419a2638) · Commits · e / os / android_frameworks_base

cmds/bootanimation/BootAnimation.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -114,7 +114,7 @@ public:
		virtual void shutdown() {}
		};

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

		sp<SurfaceComposerClient> session() const;

		@@ -128,7 +128,7 @@ private:

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