Merge changes I8a7ff4b0,Id121ecd4,I23375d73 am: 944e640e16 (69871db8) · Commits · e / os / android_hardware_interfaces

graphics/composer/2.1/utils/hwc2on1adapter/HWC2On1Adapter.cpp

+5 −5

Original line number	Diff line number	Diff line
		@@ -1389,7 +1389,7 @@ static std::string rectString(hwc_rect_t rect) {
		}

		static std::string approximateFloatString(float f) {
		if (static_cast<int32_t>(f) == f) {
		if (static_cast<float>(static_cast<int32_t>(f)) == f) {
		return std::to_string(static_cast<int32_t>(f));
		}
		int32_t truncated = static_cast<int32_t>(f * 10);
		@@ -1680,10 +1680,10 @@ std::string HWC2On1Adapter::Display::Config::toString(bool splitLine) const {
		if (mAttributes.count(HWC2::Attribute::DpiX) != 0 &&
		mAttributes.at(HWC2::Attribute::DpiX) != -1) {
		std::memset(buffer, 0, BUFFER_SIZE);
		writtenBytes = snprintf(buffer, BUFFER_SIZE,
		", DPI: %.1f x %.1f",
		mAttributes.at(HWC2::Attribute::DpiX) / 1000.0f,
		mAttributes.at(HWC2::Attribute::DpiY) / 1000.0f);
		writtenBytes =
		snprintf(buffer, BUFFER_SIZE, ", DPI: %.1f x %.1f",
		static_cast<float>(mAttributes.at(HWC2::Attribute::DpiX)) / 1000.0f,
		static_cast<float>(mAttributes.at(HWC2::Attribute::DpiY)) / 1000.0f);
		output.append(buffer, writtenBytes);
		}

+3 −3

Original line number	Diff line number	Diff line
		@@ -68,9 +68,9 @@ void convertFromSensorEvent(const sensors_event_t &src, Event *dst) {
		typedef ::android::hardware::sensors::V1_0::MetaDataEventType MetaDataEventType;

		*dst = {
		.timestamp = src.timestamp,
		.sensorHandle = src.sensor,
		.sensorType = (SensorType)src.type,
		.timestamp = src.timestamp
		};

		switch (dst->sensorType) {

+1 −1

Original line number	Diff line number	Diff line
		@@ -147,8 +147,8 @@ BufferDescriptor GrallocHalWrapper<AllocatorT, MapperT>::getDescriptor(uint32_t
		.width = size,
		.height = 1,
		.layerCount = 1,
		.usage = kBufferUsage,
		.format = static_cast<decltype(descriptorInfo.format)>(PixelFormat::BLOB),
		.usage = kBufferUsage,
		};

		BufferDescriptor descriptor;