Merge "Remove GenericMetadata from composer3" (c451b5e3) · Commits · e / os / platform_frameworks_native

services/surfaceflinger/DisplayHardware/AidlComposerHal.cpp

+7 −26

Original line number	Original line	Diff line number	Diff line
	@@ -59,14 +59,11 @@ using AidlVsyncPeriodChangeConstraints =
	aidl::android::hardware::graphics::composer3::VsyncPeriodChangeConstraints;		aidl::android::hardware::graphics::composer3::VsyncPeriodChangeConstraints;
	using AidlVsyncPeriodChangeTimeline =		using AidlVsyncPeriodChangeTimeline =
	aidl::android::hardware::graphics::composer3::VsyncPeriodChangeTimeline;		aidl::android::hardware::graphics::composer3::VsyncPeriodChangeTimeline;
	using AidlLayerGenericMetadataKey =
	aidl::android::hardware::graphics::composer3::LayerGenericMetadataKey;
	using AidlDisplayContentSamplingAttributes =		using AidlDisplayContentSamplingAttributes =
	aidl::android::hardware::graphics::composer3::DisplayContentSamplingAttributes;		aidl::android::hardware::graphics::composer3::DisplayContentSamplingAttributes;
	using AidlFormatColorComponent = aidl::android::hardware::graphics::composer3::FormatColorComponent;		using AidlFormatColorComponent = aidl::android::hardware::graphics::composer3::FormatColorComponent;
	using AidlDisplayConnectionType =		using AidlDisplayConnectionType =
	aidl::android::hardware::graphics::composer3::DisplayConnectionType;		aidl::android::hardware::graphics::composer3::DisplayConnectionType;
	using AidlIComposerClient = aidl::android::hardware::graphics::composer3::IComposerClient;

	using AidlColorTransform = aidl::android::hardware::graphics::common::ColorTransform;		using AidlColorTransform = aidl::android::hardware::graphics::common::ColorTransform;
	using AidlDataspace = aidl::android::hardware::graphics::common::Dataspace;		using AidlDataspace = aidl::android::hardware::graphics::common::Dataspace;
	@@ -166,14 +163,6 @@ VsyncPeriodChangeTimeline translate(AidlVsyncPeriodChangeTimeline x) {
	};		};
	}		}

	template <>
	IComposerClient::LayerGenericMetadataKey translate(AidlLayerGenericMetadataKey x) {
	return IComposerClient::LayerGenericMetadataKey{
	.name = x.name,
	.mandatory = x.mandatory,
	};
	}

	template <>		template <>
	IComposerClient::ClientTargetProperty translate(ClientTargetProperty x) {		IComposerClient::ClientTargetProperty translate(ClientTargetProperty x) {
	return IComposerClient::ClientTargetProperty{		return IComposerClient::ClientTargetProperty{
	@@ -989,24 +978,16 @@ V2_4::Error AidlComposer::setContentType(Display display,
	return V2_4::Error::NONE;		return V2_4::Error::NONE;
	}		}

	V2_4::Error AidlComposer::setLayerGenericMetadata(Display display, Layer layer,		V2_4::Error AidlComposer::setLayerGenericMetadata(Display, Layer, const std::string&, bool,
	const std::string& key, bool mandatory,		const std::vector<uint8_t>&) {
	const std::vector<uint8_t>& value) {		// There are no users for this API. See b/209691612.
	mWriter.setLayerGenericMetadata(translate<int64_t>(display), translate<int64_t>(layer), key,		return V2_4::Error::UNSUPPORTED;
	mandatory, value);
	return V2_4::Error::NONE;
	}		}

	V2_4::Error AidlComposer::getLayerGenericMetadataKeys(		V2_4::Error AidlComposer::getLayerGenericMetadataKeys(
	std::vector<IComposerClient::LayerGenericMetadataKey>* outKeys) {		std::vector<IComposerClient::LayerGenericMetadataKey>*) {
	std::vector<AidlLayerGenericMetadataKey> keys;		// There are no users for this API. See b/209691612.
	const auto status = mAidlComposerClient->getLayerGenericMetadataKeys(&keys);		return V2_4::Error::UNSUPPORTED;
	if (!status.isOk()) {
	ALOGE("getLayerGenericMetadataKeys failed %s", status.getDescription().c_str());
	return static_cast<V2_4::Error>(status.getServiceSpecificError());
	}
	*outKeys = translate<IComposerClient::LayerGenericMetadataKey>(keys);
	return V2_4::Error::NONE;
	}		}

	Error AidlComposer::getClientTargetProperty(		Error AidlComposer::getClientTargetProperty(