Snap for 10617316 from b72bb660d2e2e603b457e3aea00bccd3fcea6d51 to udc-qpr1-release (782edb4c) · Commits · e / os / android_frameworks_native

services/inputflinger/dispatcher/InputDispatcher.cpp

+9 −1

Original line number	Diff line number	Diff line
		@@ -668,7 +668,15 @@ std::vector<TouchedWindow> getHoveringWindowsLocked(const TouchState* oldState,
		} else {
		// This pointer was already sent to the window. Use ACTION_HOVER_MOVE.
		if (CC_UNLIKELY(maskedAction != AMOTION_EVENT_ACTION_HOVER_MOVE)) {
		LOG(FATAL) << "Expected ACTION_HOVER_MOVE instead of " << entry.getDescription();
		android::base::LogSeverity severity = android::base::LogSeverity::FATAL;
		if (entry.flags & AMOTION_EVENT_FLAG_IS_ACCESSIBILITY_EVENT) {
		// The Accessibility injected touch exploration event stream
		// has known inconsistencies, so log ERROR instead of
		// crashing the device with FATAL.
		// TODO(b/286037469): Move a11y severity back to FATAL.
		severity = android::base::LogSeverity::ERROR;
		}
		LOG(severity) << "Expected ACTION_HOVER_MOVE instead of " << entry.getDescription();
		}
		touchedWindow.targetFlags = InputTarget::Flags::DISPATCH_AS_IS;
		}

services/inputflinger/tests/InputDispatcher_test.cpp

+23 −0

Original line number	Diff line number	Diff line
		@@ -3407,6 +3407,29 @@ TEST_F(InputDispatcherTest, HoverExitIsSentToRemovedWindow) {
		window->consumeMotionEvent(WithMotionAction(AMOTION_EVENT_ACTION_HOVER_EXIT));
		}

		/**
		* Test that invalid HOVER events sent by accessibility do not cause a fatal crash.
		*/
		TEST_F(InputDispatcherTest, InvalidA11yHoverStreamDoesNotCrash) {
		std::shared_ptr<FakeApplicationHandle> application = std::make_shared<FakeApplicationHandle>();
		sp<FakeWindowHandle> window =
		sp<FakeWindowHandle>::make(application, mDispatcher, "Window", ADISPLAY_ID_DEFAULT);
		window->setFrame(Rect(0, 0, 1200, 800));
		mDispatcher->setFocusedApplication(ADISPLAY_ID_DEFAULT, application);
		mDispatcher->setInputWindows({{ADISPLAY_ID_DEFAULT, {window}}});

		MotionEventBuilder hoverEnterBuilder =
		MotionEventBuilder(AMOTION_EVENT_ACTION_HOVER_ENTER, AINPUT_SOURCE_MOUSE)
		.pointer(PointerBuilder(0, ToolType::MOUSE).x(300).y(400))
		.addFlag(AMOTION_EVENT_FLAG_IS_ACCESSIBILITY_EVENT);
		ASSERT_EQ(InputEventInjectionResult::SUCCEEDED,
		injectMotionEvent(mDispatcher, hoverEnterBuilder.build()));
		ASSERT_EQ(InputEventInjectionResult::SUCCEEDED,
		injectMotionEvent(mDispatcher, hoverEnterBuilder.build()));
		window->consumeMotionEvent(WithMotionAction(AMOTION_EVENT_ACTION_HOVER_ENTER));
		window->consumeMotionEvent(WithMotionAction(AMOTION_EVENT_ACTION_HOVER_ENTER));
		}

		/**
		* If mouse is hovering when the touch goes down, the hovering should be stopped via HOVER_EXIT.
		*/

vulkan/include/vulkan/vk_android_native_buffer.h

+40 −3

Original line number	Diff line number	Diff line
		@@ -55,7 +55,12 @@ extern "C" {
		* This version of the extension is largely designed to clean up the mix of
		* GrallocUsage and GrallocUsage2
		*/
		#define VK_ANDROID_NATIVE_BUFFER_SPEC_VERSION 9
		/*
		* NOTE ON VK_ANDROID_NATIVE_BUFFER_SPEC_VERSION 10
		*
		* This version of the extension cleans up a bug introduced in version 9
		*/
		#define VK_ANDROID_NATIVE_BUFFER_SPEC_VERSION 10
		#define VK_ANDROID_NATIVE_BUFFER_EXTENSION_NAME "VK_ANDROID_native_buffer"

		#define VK_ANDROID_NATIVE_BUFFER_ENUM(type, id) \
		@@ -69,6 +74,8 @@ extern "C" {
		VK_ANDROID_NATIVE_BUFFER_ENUM(VkStructureType, 2)
		#define VK_STRUCTURE_TYPE_GRALLOC_USAGE_INFO_ANDROID \
		VK_ANDROID_NATIVE_BUFFER_ENUM(VkStructureType, 3)
		#define VK_STRUCTURE_TYPE_GRALLOC_USAGE_INFO_2_ANDROID \
		VK_ANDROID_NATIVE_BUFFER_ENUM(VkStructureType, 4)

		/* clang-format off */
		typedef enum VkSwapchainImageUsageFlagBitsANDROID {
		@@ -152,6 +159,23 @@ typedef struct {
		VkImageUsageFlags imageUsage;
		} VkGrallocUsageInfoANDROID;

		/*
		* struct VkGrallocUsageInfo2ANDROID
		*
		* sType: VK_STRUCTURE_TYPE_GRALLOC_USAGE_INFO_2_ANDROID
		* pNext: NULL or a pointer to a structure extending this structure
		* format: value specifying the format the image will be created with
		* imageUsage: bitmask of VkImageUsageFlagBits describing intended usage
		* swapchainImageUsage: is a bitmask of VkSwapchainImageUsageFlagsANDROID
		*/
		typedef struct {
		VkStructureType sType;
		const void* pNext;
		VkFormat format;
		VkImageUsageFlags imageUsage;
		VkSwapchainImageUsageFlagsANDROID swapchainImageUsage;
		} VkGrallocUsageInfo2ANDROID;

		/* DEPRECATED in SPEC_VERSION 6 */
		typedef VkResult (VKAPI_PTR *PFN_vkGetSwapchainGrallocUsageANDROID)(
		VkDevice device,
		@@ -168,12 +192,18 @@ typedef VkResult (VKAPI_PTR *PFN_vkGetSwapchainGrallocUsage2ANDROID)(
		uint64_t* grallocConsumerUsage,
		uint64_t* grallocProducerUsage);

		/* ADDED in SPEC_VERSION 9 */
		/* DEPRECATED in SPEC_VERSION 10 */
		typedef VkResult (VKAPI_PTR *PFN_vkGetSwapchainGrallocUsage3ANDROID)(
		VkDevice device,
		const VkGrallocUsageInfoANDROID* grallocUsageInfo,
		uint64_t* grallocUsage);

		/* ADDED in SPEC_VERSION 10 */
		typedef VkResult (VKAPI_PTR *PFN_vkGetSwapchainGrallocUsage4ANDROID)(
		VkDevice device,
		const VkGrallocUsageInfo2ANDROID* grallocUsageInfo,
		uint64_t* grallocUsage);

		typedef VkResult (VKAPI_PTR *PFN_vkAcquireImageANDROID)(
		VkDevice device,
		VkImage image,
		@@ -208,13 +238,20 @@ VKAPI_ATTR VkResult VKAPI_CALL vkGetSwapchainGrallocUsage2ANDROID(
		uint64_t* grallocProducerUsage
		);

		/* ADDED in SPEC_VERSION 9 */
		/* DEPRECATED in SPEC_VERSION 10 */
		VKAPI_ATTR VkResult VKAPI_CALL vkGetSwapchainGrallocUsage3ANDROID(
		VkDevice device,
		const VkGrallocUsageInfoANDROID* grallocUsageInfo,
		uint64_t* grallocUsage
		);

		/* ADDED in SPEC_VERSION 10 */
		VKAPI_ATTR VkResult VKAPI_CALL vkGetSwapchainGrallocUsage4ANDROID(
		VkDevice device,
		const VkGrallocUsageInfo2ANDROID* grallocUsageInfo,
		uint64_t* grallocUsage
		);

		VKAPI_ATTR VkResult VKAPI_CALL vkAcquireImageANDROID(
		VkDevice device,
		VkImage image,

vulkan/libvulkan/driver.cpp

+4 −2

Original line number	Diff line number	Diff line
		@@ -1422,13 +1422,15 @@ VkResult CreateDevice(VkPhysicalDevice physicalDevice,
		if ((wrapper.GetHalExtensions()[ProcHook::ANDROID_native_buffer]) &&
		!data->driver.GetSwapchainGrallocUsageANDROID &&
		!data->driver.GetSwapchainGrallocUsage2ANDROID &&
		!data->driver.GetSwapchainGrallocUsage3ANDROID) {
		!data->driver.GetSwapchainGrallocUsage3ANDROID &&
		!data->driver.GetSwapchainGrallocUsage4ANDROID) {
		ALOGE(
		"Driver's implementation of ANDROID_native_buffer is broken;"
		" must expose at least one of "
		"vkGetSwapchainGrallocUsageANDROID or "
		"vkGetSwapchainGrallocUsage2ANDROID or "
		"vkGetSwapchainGrallocUsage3ANDROID");
		"vkGetSwapchainGrallocUsage3ANDROID or "
		"vkGetSwapchainGrallocUsage4ANDROID");

		data->driver.DestroyDevice(dev, pAllocator);
		FreeDeviceData(data, data_allocator);

vulkan/libvulkan/driver_gen.cpp

+8 −0

Original line number	Diff line number	Diff line
		@@ -511,6 +511,13 @@ const ProcHook g_proc_hooks[] = {
		nullptr,
		nullptr,
		},
		{
		"vkGetSwapchainGrallocUsage4ANDROID",
		ProcHook::DEVICE,
		ProcHook::ANDROID_native_buffer,
		nullptr,
		nullptr,
		},
		{
		"vkGetSwapchainGrallocUsageANDROID",
		ProcHook::DEVICE,
		@@ -692,6 +699,7 @@ bool InitDriverTable(VkDevice dev,
		INIT_PROC_EXT(ANDROID_native_buffer, false, dev, GetSwapchainGrallocUsageANDROID);
		INIT_PROC_EXT(ANDROID_native_buffer, false, dev, GetSwapchainGrallocUsage2ANDROID);
		INIT_PROC_EXT(ANDROID_native_buffer, false, dev, GetSwapchainGrallocUsage3ANDROID);
		INIT_PROC_EXT(ANDROID_native_buffer, false, dev, GetSwapchainGrallocUsage4ANDROID);
		INIT_PROC_EXT(ANDROID_native_buffer, true, dev, AcquireImageANDROID);
		INIT_PROC_EXT(ANDROID_native_buffer, true, dev, QueueSignalReleaseImageANDROID);
		// clang-format on