Merge "inputflinger: remove "host" code" into main (2c299ab2) · Commits · e / os / platform_frameworks_native

services/inputflinger/Android.bp

+0 −3

Original line number	Diff line number	Diff line
		@@ -240,9 +240,6 @@ phony {
		"libinputservice_test",
		"Bug-115739809",
		"StructLayout_test",
		// currently unused, but still must build correctly
		"inputflinger",
		"libinputflingerhost",

		// rust targets
		"libinput_rust_test",

services/inputflinger/host/Android.bp

deleted100644 → 0

+0 −83

Original line number	Diff line number	Diff line
		// Copyright (C) 2015 The Android Open Source Project
		//
		// Licensed under the Apache License, Version 2.0 (the "License");
		// you may not use this file except in compliance with the License.
		// You may obtain a copy of the License at
		//
		// http://www.apache.org/licenses/LICENSE-2.0
		//
		// Unless required by applicable law or agreed to in writing, software
		// distributed under the License is distributed on an "AS IS" BASIS,
		// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		// See the License for the specific language governing permissions and
		// limitations under the License.

		package {
		// See: http://go/android-license-faq
		// A large-scale-change added 'default_applicable_licenses' to import
		// all of the 'license_kinds' from "frameworks_native_license"
		// to get the below license kinds:
		// SPDX-license-identifier-Apache-2.0
		default_applicable_licenses: ["frameworks_native_license"],
		}

		cc_library_shared {
		name: "libinputflingerhost",
		cpp_std: "c++20",
		srcs: [
		"InputFlinger.cpp",
		"InputDriver.cpp",
		"InputHost.cpp",
		],

		header_libs: ["jni_headers"],
		shared_libs: [
		"libbase",
		"libbinder",
		"libcrypto",
		"libcutils",
		"libinput",
		"liblog",
		"libutils",
		"libhardware",
		],
		static_libs: [
		"libarect",
		],

		cflags: [
		"-Wall",
		"-Werror",
		"-Wno-unused-parameter",
		// TODO: Move inputflinger to its own process and mark it hidden
		//-fvisibility=hidden
		],

		export_header_lib_headers: ["jni_headers"],
		export_include_dirs: ["."],
		}

		//#######################################################################
		// build input flinger executable
		cc_binary {
		name: "inputflinger",

		srcs: ["main.cpp"],

		cflags: [
		"-Wall",
		"-Werror",
		],

		shared_libs: [
		"libbase",
		"libbinder",
		"libinputflingerhost",
		"libutils",
		"libinput",
		],
		static_libs: [
		"libarect",
		"libui-types",
		],
		}

services/inputflinger/host/InputDriver.cpp

deleted100644 → 0

+0 −411

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2015 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		#include <functional>
		#include <stdint.h>
		#include <sys/types.h>
		#include <unordered_map>
		#include <vector>

		#define LOG_TAG "InputDriver"

		#define LOG_NDEBUG 0

		#include "InputDriver.h"
		#include "InputHost.h"

		#include <hardware/input.h>
		#include <input/InputDevice.h>
		#include <input/PropertyMap.h>
		#include <utils/Log.h>
		#include <utils/String8.h>

		#define INDENT2 " "

		struct input_property_map {
		std::unique_ptr<android::PropertyMap> propertyMap;
		};

		struct input_property {
		android::String8 key;
		android::String8 value;
		};

		struct input_device_identifier {
		const char* name;
		const char* uniqueId;
		input_bus_t bus;
		int32_t vendorId;
		int32_t productId;
		int32_t version;
		};

		struct input_device_definition {
		std::vector<input_report_definition*> reportDefs;
		};

		struct input_device_handle {
		input_device_identifier_t* id;
		input_device_definition_t* def;
		};

		struct input_int_usage {
		input_usage_t usage;
		int32_t min;
		int32_t max;
		float resolution;
		};

		struct input_collection {
		int32_t arity;
		std::vector<input_int_usage> intUsages;
		std::vector<input_usage_t> boolUsages;
		};

		struct InputCollectionIdHasher {
		std::size_t operator()(const input_collection_id& id) const {
		return std::hash<int>()(static_cast<int>(id));
		}
		};

		struct input_report_definition {
		std::unordered_map<input_collection_id_t, input_collection, InputCollectionIdHasher> collections;
		};


		namespace android {

		static input_host_callbacks_t kCallbacks = {
		.create_device_identifier = create_device_identifier,
		.create_device_definition = create_device_definition,
		.create_input_report_definition = create_input_report_definition,
		.create_output_report_definition = create_output_report_definition,
		.free_report_definition = free_report_definition,
		.input_device_definition_add_report = input_device_definition_add_report,
		.input_report_definition_add_collection = input_report_definition_add_collection,
		.input_report_definition_declare_usage_int = input_report_definition_declare_usage_int,
		.input_report_definition_declare_usages_bool = input_report_definition_declare_usages_bool,
		.register_device = register_device,
		.input_allocate_report = input_allocate_report,
		.input_report_set_usage_int = input_report_set_usage_int,
		.input_report_set_usage_bool = input_report_set_usage_bool,
		.report_event = report_event,
		.input_get_device_property_map = input_get_device_property_map,
		.input_get_device_property = input_get_device_property,
		.input_get_property_key = input_get_property_key,
		.input_get_property_value = input_get_property_value,
		.input_free_device_property = input_free_device_property,
		.input_free_device_property_map = input_free_device_property_map,
		};

		InputDriver::InputDriver(const char* name) : mName(String8(name)) {
		const hw_module_t* module;
		int err = input_open(&module, name);
		LOG_ALWAYS_FATAL_IF(err != 0, "Input module %s not found", name);
		mHal = reinterpret_cast<const input_module_t*>(module);
		}

		void InputDriver::init() {
		mHal->init(mHal, static_cast<input_host_t*>(this), kCallbacks);
		}

		input_device_identifier_t* InputDriver::createDeviceIdentifier(
		const char* name, int32_t productId, int32_t vendorId,
		input_bus_t bus, const char* uniqueId) {
		auto identifier = new ::input_device_identifier {
		.name = name,
		.uniqueId = uniqueId,
		.bus = bus,
		.vendorId = vendorId,
		.productId = productId,
		};
		// TODO: store this identifier somewhere
		return identifier;
		}

		input_device_definition_t* InputDriver::createDeviceDefinition() {
		return new ::input_device_definition;
		}

		input_report_definition_t* InputDriver::createInputReportDefinition() {
		return new ::input_report_definition;
		}

		input_report_definition_t* InputDriver::createOutputReportDefinition() {
		return new ::input_report_definition;
		}

		void InputDriver::freeReportDefinition(input_report_definition_t* reportDef) {
		delete reportDef;
		}

		void InputDriver::inputDeviceDefinitionAddReport(input_device_definition_t* d,
		input_report_definition_t* r) {
		d->reportDefs.push_back(r);
		}

		void InputDriver::inputReportDefinitionAddCollection(input_report_definition_t* report,
		input_collection_id_t id, int32_t arity) {
		report->collections[id] = {.arity = arity};
		}

		void InputDriver::inputReportDefinitionDeclareUsageInt(input_report_definition_t* report,
		input_collection_id_t id, input_usage_t usage, int32_t min, int32_t max,
		float resolution) {
		if (report->collections.find(id) != report->collections.end()) {
		report->collections[id].intUsages.push_back({
		.usage = usage, .min = min, .max = max, .resolution = resolution});
		}
		}

		void InputDriver::inputReportDefinitionDeclareUsagesBool(input_report_definition_t* report,
		input_collection_id_t id, input_usage_t* usage, size_t usageCount) {
		if (report->collections.find(id) != report->collections.end()) {
		for (size_t i = 0; i < usageCount; ++i) {
		report->collections[id].boolUsages.push_back(usage[i]);
		}
		}
		}

		input_device_handle_t* InputDriver::registerDevice(input_device_identifier_t* id,
		input_device_definition_t* d) {
		ALOGD("Registering device %s with %zu input reports", id->name, d->reportDefs.size());
		// TODO: save this device handle
		return new input_device_handle{ .id = id, .def = d };
		}

		void InputDriver::unregisterDevice(input_device_handle_t* handle) {
		delete handle;
		}

		input_report_t* InputDriver::inputAllocateReport(input_report_definition_t* r) {
		ALOGD("Allocating input report for definition %p", r);
		return nullptr;
		}

		void InputDriver::inputReportSetUsageInt(input_report_t* r, input_collection_id_t id,
		input_usage_t usage, int32_t value, int32_t arity_index) {
		}

		void InputDriver::inputReportSetUsageBool(input_report_t* r, input_collection_id_t id,
		input_usage_t usage, bool value, int32_t arity_index) {
		}

		void InputDriver::reportEvent(input_device_handle_t* d, input_report_t* report) {
		ALOGD("report_event %p for handle %p", report, d);
		}

		input_property_map_t* InputDriver::inputGetDevicePropertyMap(input_device_identifier_t* id) {
		InputDeviceIdentifier idi;
		idi.name = id->name;
		idi.uniqueId = id->uniqueId;
		idi.bus = id->bus;
		idi.vendor = id->vendorId;
		idi.product = id->productId;
		idi.version = id->version;

		std::string configFile =
		getInputDeviceConfigurationFilePathByDeviceIdentifier(idi,
		InputDeviceConfigurationFileType::
		CONFIGURATION);
		if (configFile.empty()) {
		ALOGD("No input device configuration file found for device '%s'.",
		idi.name.c_str());
		} else {
		std::unique_ptr<input_property_map_t> propMap = std::make_unique<input_property_map_t>();
		android::base::Result<std::unique_ptr<PropertyMap>> result =
		PropertyMap::load(configFile.c_str());
		if (!result.ok()) {
		ALOGE("Error loading input device configuration file for device '%s'. "
		"Using default configuration.",
		idi.name.c_str());
		return nullptr;
		}
		propMap->propertyMap = std::move(*result);
		return propMap.release();
		}
		return nullptr;
		}

		input_property_t* InputDriver::inputGetDeviceProperty(input_property_map_t* map, const char* key) {
		if (map != nullptr) {
		std::optional<std::string> value = map->propertyMap->getString(key);
		if (!value.has_value()) {
		return nullptr;
		}
		auto prop = std::make_unique<input_property_t>();
		prop->key = key;
		prop->value = value->c_str();
		return prop.release();
		}
		return nullptr;
		}

		const char* InputDriver::inputGetPropertyKey(input_property_t* property) {
		if (property != nullptr) {
		return property->key.c_str();
		}
		return nullptr;
		}

		const char* InputDriver::inputGetPropertyValue(input_property_t* property) {
		if (property != nullptr) {
		return property->value.c_str();
		}
		return nullptr;
		}

		void InputDriver::inputFreeDeviceProperty(input_property_t* property) {
		if (property != nullptr) {
		delete property;
		}
		}

		void InputDriver::inputFreeDevicePropertyMap(input_property_map_t* map) {
		if (map != nullptr) {
		delete map;
		}
		}

		void InputDriver::dump(String8& result) {
		result.appendFormat(INDENT2 "HAL Input Driver (%s)\n", mName.c_str());
		}

		} // namespace android

		// HAL wrapper functions

		namespace android {

		::input_device_identifier_t* create_device_identifier(input_host_t* host,
		const char* name, int32_t product_id, int32_t vendor_id,
		input_bus_t bus, const char* unique_id) {
		auto driver = static_cast<InputDriverInterface*>(host);
		return driver->createDeviceIdentifier(name, product_id, vendor_id, bus, unique_id);
		}

		input_device_definition_t* create_device_definition(input_host_t* host) {
		auto driver = static_cast<InputDriverInterface*>(host);
		return driver->createDeviceDefinition();
		}

		input_report_definition_t* create_input_report_definition(input_host_t* host) {
		auto driver = static_cast<InputDriverInterface*>(host);
		return driver->createInputReportDefinition();
		}

		input_report_definition_t* create_output_report_definition(input_host_t* host) {
		auto driver = static_cast<InputDriverInterface*>(host);
		return driver->createOutputReportDefinition();
		}

		void free_report_definition(input_host_t* host, input_report_definition_t* report_def) {
		auto driver = static_cast<InputDriverInterface*>(host);
		driver->freeReportDefinition(report_def);
		}

		void input_device_definition_add_report(input_host_t* host,
		input_device_definition_t* d, input_report_definition_t* r) {
		auto driver = static_cast<InputDriverInterface*>(host);
		driver->inputDeviceDefinitionAddReport(d, r);
		}

		void input_report_definition_add_collection(input_host_t* host,
		input_report_definition_t* report, input_collection_id_t id, int32_t arity) {
		auto driver = static_cast<InputDriverInterface*>(host);
		driver->inputReportDefinitionAddCollection(report, id, arity);
		}

		void input_report_definition_declare_usage_int(input_host_t* host,
		input_report_definition_t* report, input_collection_id_t id,
		input_usage_t usage, int32_t min, int32_t max, float resolution) {
		auto driver = static_cast<InputDriverInterface*>(host);
		driver->inputReportDefinitionDeclareUsageInt(report, id, usage, min, max, resolution);
		}

		void input_report_definition_declare_usages_bool(input_host_t* host,
		input_report_definition_t* report, input_collection_id_t id,
		input_usage_t* usage, size_t usage_count) {
		auto driver = static_cast<InputDriverInterface*>(host);
		driver->inputReportDefinitionDeclareUsagesBool(report, id, usage, usage_count);
		}

		input_device_handle_t* register_device(input_host_t* host,
		input_device_identifier_t* id, input_device_definition_t* d) {
		auto driver = static_cast<InputDriverInterface*>(host);
		return driver->registerDevice(id, d);
		}

		void unregister_device(input_host_t* host, input_device_handle_t* handle) {
		auto driver = static_cast<InputDriverInterface*>(host);
		driver->unregisterDevice(handle);
		}

		input_report_t* input_allocate_report(input_host_t* host, input_report_definition_t* r) {
		auto driver = static_cast<InputDriverInterface*>(host);
		return driver->inputAllocateReport(r);
		}

		void input_report_set_usage_int(input_host_t* host, input_report_t* r,
		input_collection_id_t id, input_usage_t usage, int32_t value, int32_t arity_index) {
		auto driver = static_cast<InputDriverInterface*>(host);
		driver->inputReportSetUsageInt(r, id, usage, value, arity_index);
		}

		void input_report_set_usage_bool(input_host_t* host, input_report_t* r,
		input_collection_id_t id, input_usage_t usage, bool value, int32_t arity_index) {
		auto driver = static_cast<InputDriverInterface*>(host);
		driver->inputReportSetUsageBool(r, id, usage, value, arity_index);
		}

		void report_event(input_host_t* host, input_device_handle_t* d, input_report_t* report) {
		auto driver = static_cast<InputDriverInterface*>(host);
		driver->reportEvent(d, report);
		}

		input_property_map_t* input_get_device_property_map(input_host_t* host,
		input_device_identifier_t* id) {
		auto driver = static_cast<InputDriverInterface*>(host);
		return driver->inputGetDevicePropertyMap(id);
		}

		input_property_t* input_get_device_property(input_host_t* host, input_property_map_t* map,
		const char* key) {
		auto driver = static_cast<InputDriverInterface*>(host);
		return driver->inputGetDeviceProperty(map, key);
		}

		const char* input_get_property_key(input_host_t* host, input_property_t* property) {
		auto driver = static_cast<InputDriverInterface*>(host);
		return driver->inputGetPropertyKey(property);
		}

		const char* input_get_property_value(input_host_t* host, input_property_t* property) {
		auto driver = static_cast<InputDriverInterface*>(host);
		return driver->inputGetPropertyValue(property);
		}

		void input_free_device_property(input_host_t* host, input_property_t* property) {
		auto driver = static_cast<InputDriverInterface*>(host);
		driver->inputFreeDeviceProperty(property);
		}

		void input_free_device_property_map(input_host_t* host, input_property_map_t* map) {
		auto driver = static_cast<InputDriverInterface*>(host);
		driver->inputFreeDevicePropertyMap(map);
		}

		} // namespace android

services/inputflinger/host/InputDriver.h

deleted100644 → 0

+0 −193

File deleted.

Preview size limit exceeded, changes collapsed.

services/inputflinger/host/InputFlinger.cpp

deleted100644 → 0

+0 −69

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2013 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		#define LOG_TAG "InputFlinger"

		#include <stdint.h>
		#include <sys/types.h>
		#include <unistd.h>

		#include <binder/IPCThreadState.h>
		#include <binder/PermissionCache.h>
		#include <hardware/input.h>
		#include <log/log.h>
		#include <private/android_filesystem_config.h>

		#include "InputFlinger.h"
		#include "InputDriver.h"

		namespace android {

		const String16 sAccessInputFlingerPermission("android.permission.ACCESS_INPUT_FLINGER");
		const String16 sDumpPermission("android.permission.DUMP");


		InputFlinger::InputFlinger() :
		BnInputFlinger() {
		ALOGI("InputFlinger is starting");
		mHost = new InputHost();
		mHost->registerInputDriver(new InputDriver(INPUT_INSTANCE_EVDEV));
		}

		InputFlinger::~InputFlinger() {
		}

		status_t InputFlinger::dump(int fd, const Vector<String16>& args) {
		String8 result;
		const IPCThreadState* ipc = IPCThreadState::self();
		const int pid = ipc->getCallingPid();
		const int uid = ipc->getCallingUid();
		if ((uid != AID_SHELL)
		&& !PermissionCache::checkPermission(sDumpPermission, pid, uid)) {
		result.appendFormat("Permission Denial: "
		"can't dump InputFlinger from pid=%d, uid=%d\n", pid, uid);
		} else {
		dumpInternal(result);
		}
		write(fd, result.c_str(), result.size());
		return OK;
		}

		void InputFlinger::dumpInternal(String8& result) {
		result.append("INPUT FLINGER (dumpsys inputflinger)\n");
		mHost->dump(result);
		}

		}; // namespace android