Snap for 11392706 from 02c971640a149401a97960019a7236e6212ccf40 to 24Q2-release (456cfb88) · Commits · e / os / android_frameworks_native

include/input/InputTransport.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -333,7 +333,7 @@ public:
		~InputPublisher();

		/* Gets the underlying input channel. */
		inline std::shared_ptr<InputChannel> getChannel() { return mChannel; }
		inline std::shared_ptr<InputChannel> getChannel() const { return mChannel; }

		/* Publishes a key event to the input channel.
		*

libs/renderengine/skia/SkiaVkRenderEngine.cpp

+18 −16

Original line number	Diff line number	Diff line
		@@ -34,6 +34,7 @@

		#include <cstdint>
		#include <memory>
		#include <sstream>
		#include <string>
		#include <vector>

		@@ -195,32 +196,33 @@ void onVkDeviceFault(void* callbackContext, const std::string& description,
		const std::vector<VkDeviceFaultVendorInfoEXT>& vendorInfos,
		const std::vector<std::byte>& vendorBinaryData) {
		VulkanInterface* interface = static_cast<VulkanInterface*>(callbackContext);
		const string protectedStr = interface->isProtected ? "protected" : "non-protected";
		const std::string protectedStr = interface->isProtected ? "protected" : "non-protected";
		// The final crash string should contain as much differentiating info as possible, up to 1024
		// bytes. As this final message is constructed, the same information is also dumped to the logs
		// but in a more verbose format. Building the crash string is unsightly, so the clearer logging
		// statement is always placed first to give context.
		ALOGE("VK_ERROR_DEVICE_LOST (%s context): %s", protectedStr.c_str(), description.c_str());
		string crashStr = "VK_ERROR_DEVICE_LOST (" + protectedStr;
		std::stringstream crashMsg;
		crashMsg << "VK_ERROR_DEVICE_LOST (" << protectedStr;

		if (!addressInfos.empty()) {
		ALOGE("%zu VkDeviceFaultAddressInfoEXT:", addressInfos.size());
		crashStr += ", " + std::to_string(addressInfos.size()) + " address info (";
		crashMsg << ", " << addressInfos.size() << " address info (";
		for (VkDeviceFaultAddressInfoEXT addressInfo : addressInfos) {
		ALOGE(" addressType: %d", (int)addressInfo.addressType);
		ALOGE(" reportedAddress: %" PRIu64, addressInfo.reportedAddress);
		ALOGE(" addressPrecision: %" PRIu64, addressInfo.addressPrecision);
		crashStr += std::to_string(addressInfo.addressType) + ":" +
		std::to_string(addressInfo.reportedAddress) + ":" +
		std::to_string(addressInfo.addressPrecision) + ", ";
		crashMsg << addressInfo.addressType << ":"
		<< addressInfo.reportedAddress << ":"
		<< addressInfo.addressPrecision << ", ";
		}
		crashStr.resize(crashStr.size() - 2); // Remove trailing ", "
		crashStr += ")";
		crashMsg.seekp(-2, crashMsg.cur); // Move back to overwrite trailing ", "
		crashMsg << ")";
		}

		if (!vendorInfos.empty()) {
		ALOGE("%zu VkDeviceFaultVendorInfoEXT:", vendorInfos.size());
		crashStr += ", " + std::to_string(vendorInfos.size()) + " vendor info (";
		crashMsg << ", " << vendorInfos.size() << " vendor info (";
		for (VkDeviceFaultVendorInfoEXT vendorInfo : vendorInfos) {
		ALOGE(" description: %s", vendorInfo.description);
		ALOGE(" vendorFaultCode: %" PRIu64, vendorInfo.vendorFaultCode);
		@@ -230,11 +232,11 @@ void onVkDeviceFault(void* callbackContext, const std::string& description,
		// isn't worth it. Additionally, vendors may just set the general description field of
		// the overall fault to the description of the first element in this list, and that
		// overall description will be placed at the end of the crash string.
		crashStr += std::to_string(vendorInfo.vendorFaultCode) + ":" +
		std::to_string(vendorInfo.vendorFaultData) + ", ";
		crashMsg << vendorInfo.vendorFaultCode << ":"
		<< vendorInfo.vendorFaultData << ", ";
		}
		crashStr.resize(crashStr.size() - 2); // Remove trailing ", "
		crashStr += ")";
		crashMsg.seekp(-2, crashMsg.cur); // Move back to overwrite trailing ", "
		crashMsg << ")";
		}

		if (!vendorBinaryData.empty()) {
		@@ -242,11 +244,11 @@ void onVkDeviceFault(void* callbackContext, const std::string& description,
		ALOGE("%zu bytes of vendor-specific binary data (please notify Android's Core Graphics"
		" Stack team if you observe this message).",
		vendorBinaryData.size());
		crashStr += ", " + std::to_string(vendorBinaryData.size()) + " bytes binary";
		crashMsg << ", " << vendorBinaryData.size() << " bytes binary";
		}

		crashStr += "): " + description;
		LOG_ALWAYS_FATAL("%s", crashStr.c_str());
		crashMsg << "): " << description;
		LOG_ALWAYS_FATAL("%s", crashMsg.str().c_str());
		};
		} // anonymous namespace

services/inputflinger/dispatcher/Connection.cpp

+4 −0

Original line number	Diff line number	Diff line
		@@ -38,4 +38,8 @@ const std::string Connection::getWindowName() const {
		return "?";
		}

		sp<IBinder> Connection::getToken() const {
		return inputPublisher.getChannel()->getConnectionToken();
		};

		} // namespace android::inputdispatcher

services/inputflinger/dispatcher/Connection.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -64,6 +64,8 @@ public:

		inline const std::string getInputChannelName() const { return inputChannel->getName(); }

		sp<IBinder> getToken() const;

		const std::string getWindowName() const;
		};

services/inputflinger/dispatcher/Entry.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -282,7 +282,7 @@ std::string SensorEntry::getDescription() const {
		volatile int32_t DispatchEntry::sNextSeqAtomic;

		DispatchEntry::DispatchEntry(std::shared_ptr<const EventEntry> eventEntry,
		ftl::Flags<InputTarget::Flags> targetFlags,
		ftl::Flags<InputTargetFlags> targetFlags,
		const ui::Transform& transform, const ui::Transform& rawTransform,
		float globalScaleFactor, gui::Uid targetUid, int64_t vsyncId,
		std::optional<int32_t> windowId)