Snap for 13003345 from 01e3f8a348b379917f331d9b8ad2611e13b42928 to 25Q2-release (d8309e5f) · Commits · e / os / android_frameworks_native

include/input/DisplayTopologyGraph.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -42,7 +42,9 @@ enum class DisplayTopologyPosition : int32_t {
		*/
		struct DisplayTopologyAdjacentDisplay {
		ui::LogicalDisplayId displayId = ui::LogicalDisplayId::INVALID;
		// Position of the adjacent display, relative to the source display.
		DisplayTopologyPosition position;
		// The offset in DP of the adjacent display, relative to the source display.
		float offsetDp;
		};

libs/input/Android.bp

+48 −48

Original line number	Diff line number	Diff line
		@@ -27,9 +27,9 @@ filegroup {
		name: "inputconstants_aidl",
		srcs: [
		"android/os/IInputConstants.aidl",
		"android/os/InputConfig.aidl",
		"android/os/InputEventInjectionResult.aidl",
		"android/os/InputEventInjectionSync.aidl",
		"android/os/InputConfig.aidl",
		"android/os/MotionEventFlag.aidl",
		"android/os/PointerIconType.aidl",
		],
		@@ -85,56 +85,56 @@ rust_bindgen {
		source_stem: "bindings",

		bindgen_flags: [
		"--verbose",
		"--allowlist-var=AMOTION_EVENT_ACTION_CANCEL",
		"--allowlist-var=AMOTION_EVENT_ACTION_UP",
		"--allowlist-var=AMOTION_EVENT_ACTION_POINTER_DOWN",
		"--allowlist-var=AMOTION_EVENT_ACTION_DOWN",
		"--allowlist-var=AMOTION_EVENT_ACTION_POINTER_INDEX_SHIFT",
		"--allowlist-var=MAX_POINTER_ID",
		"--allowlist-var=AINPUT_SOURCE_CLASS_NONE",
		"--allowlist-var=AINPUT_KEYBOARD_TYPE_ALPHABETIC",
		"--allowlist-var=AINPUT_KEYBOARD_TYPE_NONE",
		"--allowlist-var=AINPUT_KEYBOARD_TYPE_NON_ALPHABETIC",
		"--allowlist-var=AINPUT_SOURCE_BLUETOOTH_STYLUS",
		"--allowlist-var=AINPUT_SOURCE_CLASS_BUTTON",
		"--allowlist-var=AINPUT_SOURCE_CLASS_POINTER",
		"--allowlist-var=AINPUT_SOURCE_CLASS_JOYSTICK",
		"--allowlist-var=AINPUT_SOURCE_CLASS_NAVIGATION",
		"--allowlist-var=AINPUT_SOURCE_CLASS_NONE",
		"--allowlist-var=AINPUT_SOURCE_CLASS_POINTER",
		"--allowlist-var=AINPUT_SOURCE_CLASS_POSITION",
		"--allowlist-var=AINPUT_SOURCE_CLASS_JOYSTICK",
		"--allowlist-var=AINPUT_SOURCE_UNKNOWN",
		"--allowlist-var=AINPUT_SOURCE_KEYBOARD",
		"--allowlist-var=AINPUT_SOURCE_DPAD",
		"--allowlist-var=AINPUT_SOURCE_GAMEPAD",
		"--allowlist-var=AINPUT_SOURCE_TOUCHSCREEN",
		"--allowlist-var=AINPUT_SOURCE_HDMI",
		"--allowlist-var=AINPUT_SOURCE_JOYSTICK",
		"--allowlist-var=AINPUT_SOURCE_KEYBOARD",
		"--allowlist-var=AINPUT_SOURCE_MOUSE",
		"--allowlist-var=AINPUT_SOURCE_STYLUS",
		"--allowlist-var=AINPUT_SOURCE_BLUETOOTH_STYLUS",
		"--allowlist-var=AINPUT_SOURCE_TRACKBALL",
		"--allowlist-var=AINPUT_SOURCE_MOUSE_RELATIVE",
		"--allowlist-var=AINPUT_SOURCE_ROTARY_ENCODER",
		"--allowlist-var=AINPUT_SOURCE_SENSOR",
		"--allowlist-var=AINPUT_SOURCE_STYLUS",
		"--allowlist-var=AINPUT_SOURCE_TOUCHPAD",
		"--allowlist-var=AINPUT_SOURCE_TOUCHSCREEN",
		"--allowlist-var=AINPUT_SOURCE_TOUCH_NAVIGATION",
		"--allowlist-var=AINPUT_SOURCE_JOYSTICK",
		"--allowlist-var=AINPUT_SOURCE_HDMI",
		"--allowlist-var=AINPUT_SOURCE_SENSOR",
		"--allowlist-var=AINPUT_SOURCE_ROTARY_ENCODER",
		"--allowlist-var=AINPUT_KEYBOARD_TYPE_NONE",
		"--allowlist-var=AINPUT_KEYBOARD_TYPE_NON_ALPHABETIC",
		"--allowlist-var=AINPUT_KEYBOARD_TYPE_ALPHABETIC",
		"--allowlist-var=AMETA_NONE",
		"--allowlist-var=AMETA_ALT_ON",
		"--allowlist-var=AINPUT_SOURCE_TRACKBALL",
		"--allowlist-var=AINPUT_SOURCE_UNKNOWN",
		"--allowlist-var=AMETA_ALT_LEFT_ON",
		"--allowlist-var=AMETA_ALT_ON",
		"--allowlist-var=AMETA_ALT_RIGHT_ON",
		"--allowlist-var=AMETA_SHIFT_ON",
		"--allowlist-var=AMETA_SHIFT_LEFT_ON",
		"--allowlist-var=AMETA_SHIFT_RIGHT_ON",
		"--allowlist-var=AMETA_SYM_ON",
		"--allowlist-var=AMETA_FUNCTION_ON",
		"--allowlist-var=AMETA_CTRL_ON",
		"--allowlist-var=AMETA_CAPS_LOCK_ON",
		"--allowlist-var=AMETA_CTRL_LEFT_ON",
		"--allowlist-var=AMETA_CTRL_ON",
		"--allowlist-var=AMETA_CTRL_RIGHT_ON",
		"--allowlist-var=AMETA_META_ON",
		"--allowlist-var=AMETA_FUNCTION_ON",
		"--allowlist-var=AMETA_META_LEFT_ON",
		"--allowlist-var=AMETA_META_ON",
		"--allowlist-var=AMETA_META_RIGHT_ON",
		"--allowlist-var=AMETA_CAPS_LOCK_ON",
		"--allowlist-var=AMETA_NONE",
		"--allowlist-var=AMETA_NUM_LOCK_ON",
		"--allowlist-var=AMETA_SCROLL_LOCK_ON",
		"--allowlist-var=AMETA_SHIFT_LEFT_ON",
		"--allowlist-var=AMETA_SHIFT_ON",
		"--allowlist-var=AMETA_SHIFT_RIGHT_ON",
		"--allowlist-var=AMETA_SYM_ON",
		"--allowlist-var=AMOTION_EVENT_ACTION_CANCEL",
		"--allowlist-var=AMOTION_EVENT_ACTION_DOWN",
		"--allowlist-var=AMOTION_EVENT_ACTION_POINTER_DOWN",
		"--allowlist-var=AMOTION_EVENT_ACTION_POINTER_INDEX_SHIFT",
		"--allowlist-var=AMOTION_EVENT_ACTION_UP",
		"--allowlist-var=MAX_POINTER_ID",
		"--verbose",
		],

		static_libs: [
		@@ -143,9 +143,9 @@ rust_bindgen {
		],
		shared_libs: ["libc++"],
		header_libs: [
		"native_headers",
		"jni_headers",
		"flatbuffer_headers",
		"jni_headers",
		"native_headers",
		],
		}

		@@ -179,8 +179,8 @@ cc_library_static {
		host_supported: true,
		cflags: [
		"-Wall",
		"-Wextra",
		"-Werror",
		"-Wextra",
		],
		srcs: [
		"FromRustToCpp.cpp",
		@@ -205,15 +205,15 @@ cc_library {
		cpp_std: "c++20",
		host_supported: true,
		cflags: [
		"-DANDROID_UTILS_REF_BASE_DISABLE_IMPLICIT_CONSTRUCTION",
		"-Wall",
		"-Wextra",
		"-Werror",
		"-Wextra",
		"-Wno-unused-parameter",
		"-Wthread-safety",
		"-Wshadow",
		"-Wshadow-field-in-constructor-modified",
		"-Wshadow-uncaptured-local",
		"-DANDROID_UTILS_REF_BASE_DISABLE_IMPLICIT_CONSTRUCTION",
		"-Wthread-safety",
		],
		srcs: [
		"AccelerationCurve.cpp",
		@@ -225,10 +225,10 @@ cc_library {
		"InputEventLabels.cpp",
		"InputTransport.cpp",
		"InputVerifier.cpp",
		"Keyboard.cpp",
		"KeyCharacterMap.cpp",
		"KeyboardClassifier.cpp",
		"KeyLayoutMap.cpp",
		"Keyboard.cpp",
		"KeyboardClassifier.cpp",
		"MotionPredictor.cpp",
		"MotionPredictorMetricsManager.cpp",
		"OneEuroFilter.cpp",
		@@ -262,13 +262,13 @@ cc_library {

		shared_libs: [
		"android.companion.virtualdevice.flags-aconfig-cc",
		"libPlatformProperties",
		"libaconfig_storage_read_api_cc",
		"libbase",
		"libbinder",
		"libbinder_ndk",
		"libcutils",
		"liblog",
		"libPlatformProperties",
		"libtinyxml2",
		"libutils",
		"libz", // needed by libkernelconfigs
		@@ -287,15 +287,15 @@ cc_library {

		static_libs: [
		"inputconstants-cpp",
		"libui-types",
		"libtflite_static",
		"libkernelconfigs",
		"libtflite_static",
		"libui-types",
		],

		whole_static_libs: [
		"com.android.input.flags-aconfig-cc",
		"libinput_rust_ffi",
		"iinputflinger_aidl_lib_static",
		"libinput_rust_ffi",
		],

		export_static_lib_headers: [
		@@ -310,8 +310,8 @@ cc_library {
		target: {
		android: {
		required: [
		"motion_predictor_model_prebuilt",
		"motion_predictor_model_config",
		"motion_predictor_model_prebuilt",
		],
		static_libs: [
		"libstatslog_libinput",
		@@ -372,9 +372,9 @@ cc_defaults {
		cpp_std: "c++20",
		host_supported: true,
		shared_libs: [
		"libutils",
		"libbase",
		"liblog",
		"libutils",
		],
		}

libs/input/rust/Android.bp

+2 −2

Original line number	Diff line number	Diff line
		@@ -18,12 +18,12 @@ rust_defaults {
		srcs: ["lib.rs"],
		host_supported: true,
		rustlibs: [
		"inputconstants-rust",
		"libbitflags",
		"libcxx",
		"libinput_bindgen",
		"liblogger",
		"liblog_rust",
		"inputconstants-rust",
		"liblogger",
		"libserde",
		"libserde_json",
		],

libs/input/tests/Android.bp

+10 −10

Original line number	Diff line number	Diff line
		@@ -16,16 +16,16 @@ cc_test {
		"BlockingQueue_test.cpp",
		"IdGenerator_test.cpp",
		"InputChannel_test.cpp",
		"InputConsumer_test.cpp",
		"InputConsumerFilteredResampling_test.cpp",
		"InputConsumerResampling_test.cpp",
		"InputConsumer_test.cpp",
		"InputDevice_test.cpp",
		"InputEvent_test.cpp",
		"InputPublisherAndConsumer_test.cpp",
		"InputPublisherAndConsumerNoResampling_test.cpp",
		"InputPublisherAndConsumer_test.cpp",
		"InputVerifier_test.cpp",
		"MotionPredictor_test.cpp",
		"MotionPredictorMetricsManager_test.cpp",
		"MotionPredictor_test.cpp",
		"OneEuroFilter_test.cpp",
		"Resampler_test.cpp",
		"RingBuffer_test.cpp",
		@@ -53,8 +53,8 @@ cc_test {
		],
		cflags: [
		"-Wall",
		"-Wextra",
		"-Werror",
		"-Wextra",
		"-Wno-unused-parameter",
		],
		sanitize: {
		@@ -68,26 +68,26 @@ cc_test {
		memtag_heap: true,
		undefined: true,
		misc_undefined: [
		"bounds",
		"all",
		"bounds",
		],
		},
		},
		shared_libs: [
		"libPlatformProperties",
		"libaconfig_storage_read_api_cc",
		"libbase",
		"libbinder",
		"libcutils",
		"liblog",
		"libPlatformProperties",
		"libstatslog",
		"libtinyxml2",
		"libutils",
		"server_configurable_flags",
		],
		data: [
		"data/*",
		":motion_predictor_model",
		"data/*",
		],
		test_options: {
		unit_test: true,
		@@ -117,10 +117,10 @@ cc_library_static {
		"-Wextra",
		],
		shared_libs: [
		"libinput",
		"libbase",
		"libbinder",
		"libcutils",
		"libinput",
		"libutils",
		"libbinder",
		"libbase",
		],
		}

libs/tracing_perfetto/tracing_perfetto_internal.cpp

+4 −3

Original line number	Diff line number	Diff line
		@@ -14,15 +14,16 @@
		* limitations under the License.
		*/

		// Should match the definitions in: frameworks/native/cmds/atrace/atrace.cpp
		#define FRAMEWORK_CATEGORIES(C) \
		C(always, "always", "Always category") \
		C(graphics, "graphics", "Graphics category") \
		C(graphics, "gfx", "Graphics category") \
		C(input, "input", "Input category") \
		C(view, "view", "View category") \
		C(webview, "webview", "WebView category") \
		C(windowmanager, "wm", "WindowManager category") \
		C(activitymanager, "am", "ActivityManager category") \
		C(syncmanager, "syncmanager", "SyncManager category") \
		C(syncmanager, "sm", "SyncManager category") \
		C(audio, "audio", "Audio category") \
		C(video, "video", "Video category") \
		C(camera, "camera", "Camera category") \
		@@ -33,7 +34,7 @@
		C(rs, "rs", "RS category") \
		C(bionic, "bionic", "Bionic category") \
		C(power, "power", "Power category") \
		C(packagemanager, "packagemanager", "PackageManager category") \
		C(packagemanager, "pm", "PackageManager category") \
		C(systemserver, "ss", "System Server category") \
		C(database, "database", "Database category") \
		C(network, "network", "Network category") \