Move KeyLayoutMap from RefBase to shared_ptr. (1abffbd1) · Commits · e / os / android_frameworks_native-old

include/input/KeyLayoutMap.h

+9 −4

Original line number	Original line	Diff line number	Diff line
	@@ -17,11 +17,12 @@
	#ifndef _LIBINPUT_KEY_LAYOUT_MAP_H		#ifndef _LIBINPUT_KEY_LAYOUT_MAP_H
	#define _LIBINPUT_KEY_LAYOUT_MAP_H		#define _LIBINPUT_KEY_LAYOUT_MAP_H

			#include <android-base/result.h>
	#include <stdint.h>		#include <stdint.h>
	#include <utils/Errors.h>		#include <utils/Errors.h>
	#include <utils/KeyedVector.h>		#include <utils/KeyedVector.h>
	#include <utils/Tokenizer.h>
	#include <utils/RefBase.h>		#include <utils/RefBase.h>
			#include <utils/Tokenizer.h>

	namespace android {		namespace android {

	@@ -60,9 +61,12 @@ struct AxisInfo {
	*		*
	* This object is immutable after it has been loaded.		* This object is immutable after it has been loaded.
	*/		*/
	class KeyLayoutMap : public RefBase {		class KeyLayoutMap {
	public:		public:
	static status_t load(const std::string& filename, sp<KeyLayoutMap>* outMap);		static base::Result<std::shared_ptr<KeyLayoutMap>> load(const std::string& filename);
			static base::Result<std::shared_ptr<KeyLayoutMap>> load(Tokenizer* tokenizer);
			static base::Result<std::shared_ptr<KeyLayoutMap>> loadContents(const std::string& filename,
			const char* contents);

	status_t mapKey(int32_t scanCode, int32_t usageCode,		status_t mapKey(int32_t scanCode, int32_t usageCode,
	int32_t* outKeyCode, uint32_t* outFlags) const;		int32_t* outKeyCode, uint32_t* outFlags) const;
	@@ -71,8 +75,8 @@ public:
	status_t findUsageCodeForLed(int32_t ledCode, int32_t* outUsageCode) const;		status_t findUsageCodeForLed(int32_t ledCode, int32_t* outUsageCode) const;

	status_t mapAxis(int32_t scanCode, AxisInfo* outAxisInfo) const;		status_t mapAxis(int32_t scanCode, AxisInfo* outAxisInfo) const;
			const std::string getLoadFileName() const;

	protected:
	virtual ~KeyLayoutMap();		virtual ~KeyLayoutMap();

	private:		private:
	@@ -91,6 +95,7 @@ private:
	KeyedVector<int32_t, AxisInfo> mAxes;		KeyedVector<int32_t, AxisInfo> mAxes;
	KeyedVector<int32_t, Led> mLedsByScanCode;		KeyedVector<int32_t, Led> mLedsByScanCode;
	KeyedVector<int32_t, Led> mLedsByUsageCode;		KeyedVector<int32_t, Led> mLedsByUsageCode;
			std::string mLoadFileName;

	KeyLayoutMap();		KeyLayoutMap();

include/input/Keyboard.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -34,7 +34,7 @@ class KeyCharacterMap;
	class KeyMap {		class KeyMap {
	public:		public:
	std::string keyLayoutFile;		std::string keyLayoutFile;
	sp<KeyLayoutMap> keyLayoutMap;		std::shared_ptr<KeyLayoutMap> keyLayoutMap;

	std::string keyCharacterMapFile;		std::string keyCharacterMapFile;
	sp<KeyCharacterMap> keyCharacterMap;		sp<KeyCharacterMap> keyCharacterMap;

libs/input/KeyLayoutMap.cpp

+42 −19

Original line number	Original line	Diff line number	Diff line
	@@ -49,18 +49,43 @@ KeyLayoutMap::KeyLayoutMap() {
	KeyLayoutMap::~KeyLayoutMap() {		KeyLayoutMap::~KeyLayoutMap() {
	}		}

	status_t KeyLayoutMap::load(const std::string& filename, sp<KeyLayoutMap>* outMap) {		base::Result<std::shared_ptr<KeyLayoutMap>> KeyLayoutMap::loadContents(const std::string& filename,
	outMap->clear();		const char* contents) {
			Tokenizer* tokenizer;
			status_t status = Tokenizer::fromContents(String8(filename.c_str()), contents, &tokenizer);
			if (status) {
			ALOGE("Error %d opening key layout map.", status);
			return Errorf("Error {} opening key layout map file {}.", status, filename.c_str());
			}
			std::unique_ptr<Tokenizer> t(tokenizer);
			auto ret = load(t.get());
			if (ret) {
			(*ret)->mLoadFileName = filename;
			}
			return ret;
			}

			base::Result<std::shared_ptr<KeyLayoutMap>> KeyLayoutMap::load(const std::string& filename) {
	Tokenizer* tokenizer;		Tokenizer* tokenizer;
	status_t status = Tokenizer::open(String8(filename.c_str()), &tokenizer);		status_t status = Tokenizer::open(String8(filename.c_str()), &tokenizer);
	if (status) {		if (status) {
	ALOGE("Error %d opening key layout map file %s.", status, filename.c_str());		ALOGE("Error %d opening key layout map file %s.", status, filename.c_str());
	} else {		return Errorf("Error {} opening key layout map file {}.", status, filename.c_str());
	sp<KeyLayoutMap> map = new KeyLayoutMap();		}
			std::unique_ptr<Tokenizer> t(tokenizer);
			auto ret = load(t.get());
			if (ret) {
			(*ret)->mLoadFileName = filename;
			}
			return ret;
			}

			base::Result<std::shared_ptr<KeyLayoutMap>> KeyLayoutMap::load(Tokenizer* tokenizer) {
			std::shared_ptr<KeyLayoutMap> map = std::shared_ptr<KeyLayoutMap>(new KeyLayoutMap());
			status_t status = OK;
	if (!map.get()) {		if (!map.get()) {
	ALOGE("Error allocating key layout map.");		ALOGE("Error allocating key layout map.");
	status = NO_MEMORY;		return Errorf("Error allocating key layout map.");
	} else {		} else {
	#if DEBUG_PARSER_PERFORMANCE		#if DEBUG_PARSER_PERFORMANCE
	nsecs_t startTime = systemTime(SYSTEM_TIME_MONOTONIC);		nsecs_t startTime = systemTime(SYSTEM_TIME_MONOTONIC);
	@@ -74,12 +99,10 @@ status_t KeyLayoutMap::load(const std::string& filename, sp<KeyLayoutMap>* outMa
	elapsedTime / 1000000.0);		elapsedTime / 1000000.0);
	#endif		#endif
	if (!status) {		if (!status) {
	*outMap = map;		return std::move(map);
	}
	}		}
	delete tokenizer;
	}		}
	return status;		return Errorf("Load KeyLayoutMap failed {}.", status);
	}		}

	status_t KeyLayoutMap::mapKey(int32_t scanCode, int32_t usageCode,		status_t KeyLayoutMap::mapKey(int32_t scanCode, int32_t usageCode,

libs/input/Keyboard.cpp

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -110,11 +110,11 @@ status_t KeyMap::loadKeyLayout(const InputDeviceIdentifier& deviceIdentifier,
	return NAME_NOT_FOUND;		return NAME_NOT_FOUND;
	}		}

	status_t status = KeyLayoutMap::load(path, &keyLayoutMap);		base::Result<std::shared_ptr<KeyLayoutMap>> ret = KeyLayoutMap::load(path);
	if (status) {		if (!ret) {
	return status;		return ret.error().code();
	}		}
			keyLayoutMap = *ret;
	keyLayoutFile = path;		keyLayoutFile = path;
	return OK;		return OK;
	}		}

services/inputflinger/host/Android.bp

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -23,6 +23,7 @@ cc_library_shared {

	header_libs: ["jni_headers"],		header_libs: ["jni_headers"],
	shared_libs: [		shared_libs: [
			"libbase",
	"libbinder",		"libbinder",
	"libcrypto",		"libcrypto",
	"libcutils",		"libcutils",