Merge "Fix/suppress surfaceflinger google-explicit-constructor warnings" am: 0c667f03ef (84e51e03) · Commits · e / os / android_frameworks_native-old

services/surfaceflinger/DisplayHardware/ComposerHal.cpp

+3 −4

Original line number	Diff line number	Diff line
		@@ -41,13 +41,12 @@ namespace {

		class BufferHandle {
		public:
		BufferHandle(const native_handle_t* buffer)
		{
		explicit BufferHandle(const native_handle_t* buffer) {
		// nullptr is not a valid handle to HIDL
		mHandle = (buffer) ? buffer : native_handle_init(mStorage, 0, 0);
		}

		operator const hidl_handle&() const
		operator const hidl_handle&() const // NOLINT(google-explicit-constructor)
		{
		return mHandle;
		}
		@@ -81,7 +80,7 @@ public:
		}
		}

		operator const hidl_handle&() const
		operator const hidl_handle&() const // NOLINT(google-explicit-constructor)
		{
		return mHandle;
		}

+2 −2

Original line number	Diff line number	Diff line
		@@ -267,7 +267,7 @@ private:
		// Composer is a wrapper to IComposer, a proxy to server-side composer.
		class Composer final : public Hwc2::Composer {
		public:
		Composer(const std::string& serviceName);
		explicit Composer(const std::string& serviceName);
		~Composer() override;

		std::vector<IComposer::Capability> getCapabilities() override;
		@@ -383,7 +383,7 @@ public:
		private:
		class CommandWriter : public CommandWriterBase {
		public:
		CommandWriter(uint32_t initialMaxSize);
		explicit CommandWriter(uint32_t initialMaxSize);
		~CommandWriter() override;

		void setLayerInfo(uint32_t type, uint32_t appId);

+1 −1

Original line number	Diff line number	Diff line
		@@ -33,7 +33,7 @@ class StartPropertySetThread : public Thread {
		// Any property_set() will block during init stage so need to be offloaded
		// to this thread. see b/63844978.
		public:
		StartPropertySetThread(bool timestampPropertyValue);
		explicit StartPropertySetThread(bool timestampPropertyValue);
		status_t Start();
		private:
		virtual bool threadLoop();

+1 −1

Original line number	Diff line number	Diff line
		@@ -281,7 +281,7 @@ public:

		void expectChildColor(uint32_t x, uint32_t y) { checkPixel(x, y, 200, 200, 200); }

		ScreenCapture(const sp<GraphicBuffer>& outBuffer) : mOutBuffer(outBuffer) {
		explicit ScreenCapture(const sp<GraphicBuffer>& outBuffer) : mOutBuffer(outBuffer) {
		mOutBuffer->lock(GRALLOC_USAGE_SW_READ_OFTEN, reinterpret_cast<void**>(&mPixels));
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -81,7 +81,7 @@ public:

		class DelayedEventGenerator {
		public:
		DelayedEventGenerator(std::function<void()> onTimerExpired)
		explicit DelayedEventGenerator(std::function<void()> onTimerExpired)
		: mOnTimerExpired(onTimerExpired), mThread([this]() { loop(); }) {}

		~DelayedEventGenerator() {