Snap for 8983512 from efe6ae66ec1e10390d53ea479fc65057a4f9f201 to tm-qpr1-release (6a4a8864) · Commits · e / os / platform_frameworks_native

include/input/KeyLayoutMap.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -21,7 +21,6 @@
		#include <stdint.h>
		#include <utils/Errors.h>
		#include <utils/KeyedVector.h>
		#include <utils/RefBase.h>
		#include <utils/Tokenizer.h>

		#include <input/InputDevice.h>
		@@ -66,7 +65,6 @@ struct AxisInfo {
		class KeyLayoutMap {
		public:
		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);

		@@ -84,6 +82,8 @@ public:
		virtual ~KeyLayoutMap();

		private:
		static base::Result<std::shared_ptr<KeyLayoutMap>> load(Tokenizer* tokenizer);

		struct Key {
		int32_t keyCode;
		uint32_t flags;

libs/input/KeyLayoutMap.cpp

+49 −66

Original line number	Diff line number	Diff line
		@@ -21,8 +21,8 @@
		#include <input/InputEventLabels.h>
		#include <input/KeyLayoutMap.h>
		#include <input/Keyboard.h>
		#include <log/log.h>
		#include <utils/Errors.h>
		#include <utils/Log.h>
		#include <utils/Timers.h>
		#include <utils/Tokenizer.h>

		@@ -30,15 +30,22 @@
		#include <string_view>
		#include <unordered_map>

		// Enables debug output for the parser.
		#define DEBUG_PARSER 0
		/**
		* Log debug output for the parser.
		* Enable this via "adb shell setprop log.tag.KeyLayoutMapParser DEBUG" (requires restart)
		*/
		const bool DEBUG_PARSER =
		__android_log_is_loggable(ANDROID_LOG_DEBUG, LOG_TAG "Parser", ANDROID_LOG_INFO);

		// Enables debug output for parser performance.
		#define DEBUG_PARSER_PERFORMANCE 0

		// Enables debug output for mapping.
		#define DEBUG_MAPPING 0

		/**
		* Log debug output for mapping.
		* Enable this via "adb shell setprop log.tag.KeyLayoutMapMapping DEBUG" (requires restart)
		*/
		const bool DEBUG_MAPPING =
		__android_log_is_loggable(ANDROID_LOG_DEBUG, LOG_TAG "Mapping", ANDROID_LOG_INFO);

		namespace android {
		namespace {
		@@ -134,9 +141,8 @@ status_t KeyLayoutMap::mapKey(int32_t scanCode, int32_t usageCode,
		int32_t* outKeyCode, uint32_t* outFlags) const {
		const Key* key = getKey(scanCode, usageCode);
		if (!key) {
		#if DEBUG_MAPPING
		ALOGD("mapKey: scanCode=%d, usageCode=0x%08x ~ Failed.", scanCode, usageCode);
		#endif
		ALOGD_IF(DEBUG_MAPPING, "mapKey: scanCode=%d, usageCode=0x%08x ~ Failed.", scanCode,
		usageCode);
		*outKeyCode = AKEYCODE_UNKNOWN;
		*outFlags = 0;
		return NAME_NOT_FOUND;
		@@ -145,10 +151,9 @@ status_t KeyLayoutMap::mapKey(int32_t scanCode, int32_t usageCode,
		*outKeyCode = key->keyCode;
		*outFlags = key->flags;

		#if DEBUG_MAPPING
		ALOGD("mapKey: scanCode=%d, usageCode=0x%08x ~ Result keyCode=%d, outFlags=0x%08x.",
		ALOGD_IF(DEBUG_MAPPING,
		"mapKey: scanCode=%d, usageCode=0x%08x ~ Result keyCode=%d, outFlags=0x%08x.",
		scanCode, usageCode, outKeyCode, outFlags);
		#endif
		return NO_ERROR;
		}

		@@ -156,17 +161,12 @@ status_t KeyLayoutMap::mapKey(int32_t scanCode, int32_t usageCode,
		base::Result<std::pair<InputDeviceSensorType, int32_t>> KeyLayoutMap::mapSensor(int32_t absCode) {
		auto it = mSensorsByAbsCode.find(absCode);
		if (it == mSensorsByAbsCode.end()) {
		#if DEBUG_MAPPING
		ALOGD("mapSensor: absCode=%d, ~ Failed.", absCode);
		#endif
		ALOGD_IF(DEBUG_MAPPING, "mapSensor: absCode=%d, ~ Failed.", absCode);
		return Errorf("Can't find abs code {}.", absCode);
		}
		const Sensor& sensor = it->second;

		#if DEBUG_MAPPING
		ALOGD("mapSensor: absCode=%d, sensorType=%s, sensorDataIndex=0x%x.", absCode,
		ALOGD_IF(DEBUG_MAPPING, "mapSensor: absCode=%d, sensorType=%s, sensorDataIndex=0x%x.", absCode,
		ftl::enum_string(sensor.sensorType).c_str(), sensor.sensorDataIndex);
		#endif
		return std::make_pair(sensor.sensorType, sensor.sensorDataIndex);
		}

		@@ -200,21 +200,18 @@ status_t KeyLayoutMap::findScanCodesForKey(
		status_t KeyLayoutMap::mapAxis(int32_t scanCode, AxisInfo* outAxisInfo) const {
		ssize_t index = mAxes.indexOfKey(scanCode);
		if (index < 0) {
		#if DEBUG_MAPPING
		ALOGD("mapAxis: scanCode=%d ~ Failed.", scanCode);
		#endif
		ALOGD_IF(DEBUG_MAPPING, "mapAxis: scanCode=%d ~ Failed.", scanCode);
		return NAME_NOT_FOUND;
		}

		*outAxisInfo = mAxes.valueAt(index);

		#if DEBUG_MAPPING
		ALOGD("mapAxis: scanCode=%d ~ Result mode=%d, axis=%d, highAxis=%d, "
		ALOGD_IF(DEBUG_MAPPING,
		"mapAxis: scanCode=%d ~ Result mode=%d, axis=%d, highAxis=%d, "
		"splitValue=%d, flatOverride=%d.",
		scanCode,
		outAxisInfo->mode, outAxisInfo->axis, outAxisInfo->highAxis,
		scanCode, outAxisInfo->mode, outAxisInfo->axis, outAxisInfo->highAxis,
		outAxisInfo->splitValue, outAxisInfo->flatOverride);
		#endif

		return NO_ERROR;
		}

		@@ -223,15 +220,12 @@ status_t KeyLayoutMap::findScanCodeForLed(int32_t ledCode, int32_t* outScanCode)
		for (size_t i = 0; i < N; i++) {
		if (mLedsByScanCode.valueAt(i).ledCode == ledCode) {
		*outScanCode = mLedsByScanCode.keyAt(i);
		#if DEBUG_MAPPING
		ALOGD("findScanCodeForLed: ledCode=%d, scanCode=%d.", ledCode, *outScanCode);
		#endif
		ALOGD_IF(DEBUG_MAPPING, "findScanCodeForLed: ledCode=%d, scanCode=%d.", ledCode,
		*outScanCode);
		return NO_ERROR;
		}
		}
		#if DEBUG_MAPPING
		ALOGD("findScanCodeForLed: ledCode=%d ~ Not found.", ledCode);
		#endif
		ALOGD_IF(DEBUG_MAPPING, "findScanCodeForLed: ledCode=%d ~ Not found.", ledCode);
		return NAME_NOT_FOUND;
		}

		@@ -240,15 +234,12 @@ status_t KeyLayoutMap::findUsageCodeForLed(int32_t ledCode, int32_t* outUsageCod
		for (size_t i = 0; i < N; i++) {
		if (mLedsByUsageCode.valueAt(i).ledCode == ledCode) {
		*outUsageCode = mLedsByUsageCode.keyAt(i);
		#if DEBUG_MAPPING
		ALOGD("findUsageForLed: ledCode=%d, usage=%x.", ledCode, *outUsageCode);
		#endif
		ALOGD_IF(DEBUG_MAPPING, "%s: ledCode=%d, usage=%x.", __func__, ledCode, *outUsageCode);
		return NO_ERROR;
		}
		}
		#if DEBUG_MAPPING
		ALOGD("findUsageForLed: ledCode=%d ~ Not found.", ledCode);
		#endif
		ALOGD_IF(DEBUG_MAPPING, "%s: ledCode=%d ~ Not found.", __func__, ledCode);

		return NAME_NOT_FOUND;
		}

		@@ -264,10 +255,8 @@ KeyLayoutMap::Parser::~Parser() {

		status_t KeyLayoutMap::Parser::parse() {
		while (!mTokenizer->isEof()) {
		#if DEBUG_PARSER
		ALOGD("Parsing %s: '%s'.", mTokenizer->getLocation().string(),
		ALOGD_IF(DEBUG_PARSER, "Parsing %s: '%s'.", mTokenizer->getLocation().string(),
		mTokenizer->peekRemainderOfLine().string());
		#endif

		mTokenizer->skipDelimiters(WHITESPACE);

		@@ -361,10 +350,9 @@ status_t KeyLayoutMap::Parser::parseKey() {
		flags \|= flag;
		}

		#if DEBUG_PARSER
		ALOGD("Parsed key %s: code=%d, keyCode=%d, flags=0x%08x.",
		ALOGD_IF(DEBUG_PARSER, "Parsed key %s: code=%d, keyCode=%d, flags=0x%08x.",
		mapUsage ? "usage" : "scan code", code, keyCode, flags);
		#endif

		Key key;
		key.keyCode = keyCode;
		key.flags = flags;
		@@ -462,13 +450,12 @@ status_t KeyLayoutMap::Parser::parseAxis() {
		}
		}

		#if DEBUG_PARSER
		ALOGD("Parsed axis: scanCode=%d, mode=%d, axis=%d, highAxis=%d, "
		ALOGD_IF(DEBUG_PARSER,
		"Parsed axis: scanCode=%d, mode=%d, axis=%d, highAxis=%d, "
		"splitValue=%d, flatOverride=%d.",
		scanCode,
		axisInfo.mode, axisInfo.axis, axisInfo.highAxis,
		axisInfo.splitValue, axisInfo.flatOverride);
		#endif
		scanCode, axisInfo.mode, axisInfo.axis, axisInfo.highAxis, axisInfo.splitValue,
		axisInfo.flatOverride);

		mMap->mAxes.add(scanCode, axisInfo);
		return NO_ERROR;
		}
		@@ -505,10 +492,8 @@ status_t KeyLayoutMap::Parser::parseLed() {
		return BAD_VALUE;
		}

		#if DEBUG_PARSER
		ALOGD("Parsed led %s: code=%d, ledCode=%d.",
		mapUsage ? "usage" : "scan code", code, ledCode);
		#endif
		ALOGD_IF(DEBUG_PARSER, "Parsed led %s: code=%d, ledCode=%d.", mapUsage ? "usage" : "scan code",
		code, ledCode);

		Led led;
		led.ledCode = ledCode;
		@@ -584,10 +569,8 @@ status_t KeyLayoutMap::Parser::parseSensor() {
		}
		int32_t sensorDataIndex = indexOpt.value();

		#if DEBUG_PARSER
		ALOGD("Parsed sensor: abs code=%d, sensorType=%s, sensorDataIndex=%d.", code,
		ALOGD_IF(DEBUG_PARSER, "Parsed sensor: abs code=%d, sensorType=%s, sensorDataIndex=%d.", code,
		ftl::enum_string(sensorType).c_str(), sensorDataIndex);
		#endif

		Sensor sensor;
		sensor.sensorType = sensorType;

libs/input/tests/InputDevice_test.cpp

+1 −3

Original line number	Diff line number	Diff line
		@@ -64,13 +64,11 @@ protected:
		mKeyMap.keyCharacterMapFile = path;
		}

		virtual void SetUp() override {
		void SetUp() override {
		loadKeyLayout("Generic");
		loadKeyCharacterMap("Generic");
		}

		virtual void TearDown() override {}

		KeyMap mKeyMap;
		};

services/surfaceflinger/DisplayHardware/PowerAdvisor.cpp

+17 −20

Original line number	Diff line number	Diff line
		@@ -838,10 +838,7 @@ const bool AidlPowerHalWrapper::sTraceHintSessionData =
		base::GetBoolProperty(std::string("debug.sf.trace_hint_sessions"), false);

		PowerAdvisor::HalWrapper* PowerAdvisor::getPowerHal() {
		static std::unique_ptr<HalWrapper> sHalWrapper = nullptr;
		static bool sHasHal = true;

		if (!sHasHal) {
		if (!mHasHal) {
		return nullptr;
		}

		@@ -849,57 +846,57 @@ PowerAdvisor::HalWrapper* PowerAdvisor::getPowerHal() {
		std::vector<int32_t> oldPowerHintSessionThreadIds;
		std::optional<int64_t> oldTargetWorkDuration;

		if (sHalWrapper != nullptr) {
		oldPowerHintSessionThreadIds = sHalWrapper->getPowerHintSessionThreadIds();
		oldTargetWorkDuration = sHalWrapper->getTargetWorkDuration();
		if (mHalWrapper != nullptr) {
		oldPowerHintSessionThreadIds = mHalWrapper->getPowerHintSessionThreadIds();
		oldTargetWorkDuration = mHalWrapper->getTargetWorkDuration();
		}

		// If we used to have a HAL, but it stopped responding, attempt to reconnect
		if (mReconnectPowerHal) {
		sHalWrapper = nullptr;
		mHalWrapper = nullptr;
		mReconnectPowerHal = false;
		}

		if (sHalWrapper != nullptr) {
		auto wrapper = sHalWrapper.get();
		if (mHalWrapper != nullptr) {
		auto wrapper = mHalWrapper.get();
		// If the wrapper is fine, return it, but if it indicates a reconnect, remake it
		if (!wrapper->shouldReconnectHAL()) {
		return wrapper;
		}
		ALOGD("Reconnecting Power HAL");
		sHalWrapper = nullptr;
		mHalWrapper = nullptr;
		}

		// At this point, we know for sure there is no running session
		mPowerHintSessionRunning = false;

		// First attempt to connect to the AIDL Power HAL
		sHalWrapper = AidlPowerHalWrapper::connect();
		mHalWrapper = AidlPowerHalWrapper::connect();

		// If that didn't succeed, attempt to connect to the HIDL Power HAL
		if (sHalWrapper == nullptr) {
		sHalWrapper = HidlPowerHalWrapper::connect();
		if (mHalWrapper == nullptr) {
		mHalWrapper = HidlPowerHalWrapper::connect();
		} else {
		ALOGD("Successfully connecting AIDL Power HAL");
		// If AIDL, pass on any existing hint session values
		sHalWrapper->setPowerHintSessionThreadIds(oldPowerHintSessionThreadIds);
		mHalWrapper->setPowerHintSessionThreadIds(oldPowerHintSessionThreadIds);
		// Only set duration and start if duration is defined
		if (oldTargetWorkDuration.has_value()) {
		sHalWrapper->setTargetWorkDuration(*oldTargetWorkDuration);
		mHalWrapper->setTargetWorkDuration(*oldTargetWorkDuration);
		// Only start if possible to run and both threadids and duration are defined
		if (usePowerHintSession() && !oldPowerHintSessionThreadIds.empty()) {
		mPowerHintSessionRunning = sHalWrapper->startPowerHintSession();
		mPowerHintSessionRunning = mHalWrapper->startPowerHintSession();
		}
		}
		}

		// If we make it to this point and still don't have a HAL, it's unlikely we
		// will, so stop trying
		if (sHalWrapper == nullptr) {
		sHasHal = false;
		if (mHalWrapper == nullptr) {
		mHasHal = false;
		}

		return sHalWrapper.get();
		return mHalWrapper.get();
		}

		} // namespace impl

services/surfaceflinger/DisplayHardware/PowerAdvisor.h

+7 −0

Original line number	Diff line number	Diff line
		@@ -154,6 +154,13 @@ public:
		void setTotalFrameTargetWorkDuration(nsecs_t targetDuration) override;

		private:
		friend class PowerAdvisorTest;

		// Tracks if powerhal exists
		bool mHasHal = true;
		// Holds the hal wrapper for getPowerHal
		std::unique_ptr<HalWrapper> mHalWrapper GUARDED_BY(mPowerHalMutex) = nullptr;

		HalWrapper* getPowerHal() REQUIRES(mPowerHalMutex);
		bool mReconnectPowerHal GUARDED_BY(mPowerHalMutex) = false;
		std::mutex mPowerHalMutex;