Snap for 11380007 from 169d22e5543cad1aace22ee5b2016a44667444b2 to 24Q2-release (9791dc69) · Commits · e / os / android_frameworks_native

include/android/keycodes.h

+4 −0

Original line number	Diff line number	Diff line
		@@ -839,6 +839,10 @@ enum {
		AKEYCODE_MACRO_3 = 315,
		/** User customizable key #4. */
		AKEYCODE_MACRO_4 = 316,
		/** Open Emoji picker */
		AKEYCODE_EMOJI_PICKER = 317,
		/** Take Screenshot */
		AKEYCODE_SCREENSHOT = 318,

		// NOTE: If you add a new keycode here you must also add it to several other files.
		// Refer to frameworks/base/core/java/android/view/KeyEvent.java for the full list.

libs/input/InputEventLabels.cpp

+3 −1

Original line number	Diff line number	Diff line
		@@ -348,7 +348,9 @@ namespace android {
		DEFINE_KEYCODE(MACRO_1), \
		DEFINE_KEYCODE(MACRO_2), \
		DEFINE_KEYCODE(MACRO_3), \
		DEFINE_KEYCODE(MACRO_4)
		DEFINE_KEYCODE(MACRO_4), \
		DEFINE_KEYCODE(EMOJI_PICKER), \
		DEFINE_KEYCODE(SCREENSHOT)

		// NOTE: If you add a new axis here you must also add it to several other files.
		// Refer to frameworks/base/core/java/android/view/MotionEvent.java for the full list.

libs/renderengine/skia/SkiaVkRenderEngine.cpp

+84 −0

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

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

		#include <vulkan/vulkan.h>
		@@ -67,6 +68,13 @@ struct DestroySemaphoreInfo {
		DestroySemaphoreInfo(VkSemaphore semaphore) : mSemaphore(semaphore) {}
		};

		namespace {
		void onVkDeviceFault(void* callbackContext, const std::string& description,
		const std::vector<VkDeviceFaultAddressInfoEXT>& addressInfos,
		const std::vector<VkDeviceFaultVendorInfoEXT>& vendorInfos,
		const std::vector<std::byte>& vendorBinaryData);
		} // anonymous namespace

		struct VulkanInterface {
		bool initialized = false;
		VkInstance instance;
		@@ -79,6 +87,7 @@ struct VulkanInterface {
		VkPhysicalDeviceFeatures2* physicalDeviceFeatures2 = nullptr;
		VkPhysicalDeviceSamplerYcbcrConversionFeatures* samplerYcbcrConversionFeatures = nullptr;
		VkPhysicalDeviceProtectedMemoryFeatures* protectedMemoryFeatures = nullptr;
		VkPhysicalDeviceFaultFeaturesEXT* deviceFaultFeatures = nullptr;
		GrVkGetProc grGetProc;
		bool isProtected;
		bool isRealtimePriority;
		@@ -100,6 +109,8 @@ struct VulkanInterface {
		backendContext.fDeviceFeatures2 = physicalDeviceFeatures2;
		backendContext.fGetProc = grGetProc;
		backendContext.fProtectedContext = isProtected ? GrProtected::kYes : GrProtected::kNo;
		backendContext.fDeviceLostContext = this; // VulkanInterface is long-lived
		backendContext.fDeviceLostProc = onVkDeviceFault;
		return backendContext;
		};

		@@ -178,6 +189,67 @@ struct VulkanInterface {
		}
		};

		namespace {
		void onVkDeviceFault(void* callbackContext, const std::string& description,
		const std::vector<VkDeviceFaultAddressInfoEXT>& addressInfos,
		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";
		// 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;

		if (!addressInfos.empty()) {
		ALOGE("%zu VkDeviceFaultAddressInfoEXT:", addressInfos.size());
		crashStr += ", " + std::to_string(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) + ", ";
		}
		crashStr.resize(crashStr.size() - 2); // Remove trailing ", "
		crashStr += ")";
		}

		if (!vendorInfos.empty()) {
		ALOGE("%zu VkDeviceFaultVendorInfoEXT:", vendorInfos.size());
		crashStr += ", " + std::to_string(vendorInfos.size()) + " vendor info (";
		for (VkDeviceFaultVendorInfoEXT vendorInfo : vendorInfos) {
		ALOGE(" description: %s", vendorInfo.description);
		ALOGE(" vendorFaultCode: %" PRIu64, vendorInfo.vendorFaultCode);
		ALOGE(" vendorFaultData: %" PRIu64, vendorInfo.vendorFaultData);
		// Omit descriptions for individual vendor info structs in the crash string, as the
		// fault code and fault data fields should be enough for clustering, and the verbosity
		// 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) + ", ";
		}
		crashStr.resize(crashStr.size() - 2); // Remove trailing ", "
		crashStr += ")";
		}

		if (!vendorBinaryData.empty()) {
		// TODO: b/322830575 - Log in base64, or dump directly to a file that gets put in bugreports
		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";
		}

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

		static GrVkGetProc sGetProc = [](const char* proc_name, VkInstance instance, VkDevice device) {
		if (device != VK_NULL_HANDLE) {
		return vkGetDeviceProcAddr(device, proc_name);
		@@ -429,6 +501,14 @@ VulkanInterface initVulkanInterface(bool protectedContent = false) {
		tailPnext = &interface.protectedMemoryFeatures->pNext;
		}

		if (interface.grExtensions.hasExtension(VK_EXT_DEVICE_FAULT_EXTENSION_NAME, 1)) {
		interface.deviceFaultFeatures = new VkPhysicalDeviceFaultFeaturesEXT;
		interface.deviceFaultFeatures->sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FAULT_FEATURES_EXT;
		interface.deviceFaultFeatures->pNext = nullptr;
		*tailPnext = interface.deviceFaultFeatures;
		tailPnext = &interface.deviceFaultFeatures->pNext;
		}

		vkGetPhysicalDeviceFeatures2(physicalDevice, interface.physicalDeviceFeatures2);
		// Looks like this would slow things down and we can't depend on it on all platforms
		interface.physicalDeviceFeatures2->features.robustBufferAccess = VK_FALSE;
		@@ -545,6 +625,10 @@ void teardownVulkanInterface(VulkanInterface* interface) {
		delete interface->physicalDeviceFeatures2;
		}

		if (interface->deviceFaultFeatures) {
		delete interface->deviceFaultFeatures;
		}

		interface->samplerYcbcrConversionFeatures = nullptr;
		interface->physicalDeviceFeatures2 = nullptr;
		interface->protectedMemoryFeatures = nullptr;

libs/sensor/Android.bp

+16 −0

Original line number	Diff line number	Diff line
		@@ -21,6 +21,18 @@ package {
		default_applicable_licenses: ["frameworks_native_license"],
		}

		aconfig_declarations {
		name: "libsensor_flags",
		package: "com.android.hardware.libsensor.flags",
		srcs: ["libsensor_flags.aconfig"],
		}

		cc_aconfig_library {
		name: "libsensor_flags_c_lib",
		host_supported: true,
		aconfig_declarations: "libsensor_flags",
		}

		cc_library {
		name: "libsensor",

		@@ -52,6 +64,10 @@ cc_library {
		"android.companion.virtual.virtualdevice_aidl-cpp",
		],

		static_libs: [
		"libsensor_flags_c_lib",
		],

		export_include_dirs: ["include"],

		export_shared_lib_headers: [

libs/sensor/SensorManager.cpp

+6 −0

Original line number	Diff line number	Diff line
		@@ -37,6 +37,8 @@
		#include <sensor/Sensor.h>
		#include <sensor/SensorEventQueue.h>

		#include <com_android_hardware_libsensor_flags.h>

		// ----------------------------------------------------------------------------
		namespace android {
		// ----------------------------------------------------------------------------
		@@ -192,6 +194,9 @@ void SensorManager::sensorManagerDied() {
		}

		status_t SensorManager::assertStateLocked() {
		#if COM_ANDROID_HARDWARE_LIBSENSOR_FLAGS(SENSORMANAGER_PING_BINDER)
		if (mSensorServer == nullptr) {
		#else
		bool initSensorManager = false;
		if (mSensorServer == nullptr) {
		initSensorManager = true;
		@@ -203,6 +208,7 @@ status_t SensorManager::assertStateLocked() {
		}
		}
		if (initSensorManager) {
		#endif
		waitForSensorService(&mSensorServer);
		LOG_ALWAYS_FATAL_IF(mSensorServer == nullptr, "getService(SensorService) NULL");