Merge "Return<*> getStatus().isOk() -> isOk()" (ad500399) · Commits · e / os / platform_frameworks_native

services/surfaceflinger/DisplayHardware/ComposerHal.cpp

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -91,7 +91,7 @@ constexpr Error kDefaultError = Error::NO_RESOURCES;
	template<typename T, typename U>		template<typename T, typename U>
	T unwrapRet(Return<T>& ret, const U& default_val)		T unwrapRet(Return<T>& ret, const U& default_val)
	{		{
	return (ret.getStatus().isOk()) ? static_cast<T>(ret) :		return (ret.isOk()) ? static_cast<T>(ret) :
	static_cast<T>(default_val);		static_cast<T>(default_val);
	}		}

	@@ -146,7 +146,7 @@ std::string Composer::dumpDebugInfo()
	void Composer::registerCallback(const sp<IComposerCallback>& callback)		void Composer::registerCallback(const sp<IComposerCallback>& callback)
	{		{
	auto ret = mClient->registerCallback(callback);		auto ret = mClient->registerCallback(callback);
	if (!ret.getStatus().isOk()) {		if (!ret.isOk()) {
	ALOGE("failed to register IComposerCallback");		ALOGE("failed to register IComposerCallback");
	}		}
	}		}