Merge "Fix iterator usage" into rvc-dev am: 85df93ed71 (c2701174) · Commits · e / os / android_frameworks_base

services/core/jni/com_android_server_tv_TvUinputBridge.cpp

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -106,7 +106,7 @@ static int getGamepadkeyCode(int32_t androidKeyCode) {
	static const GamepadAxis* getGamepadAxis(int32_t androidAxisCode) {		static const GamepadAxis* getGamepadAxis(int32_t androidAxisCode) {
	std::unordered_map<int32_t, int>::iterator it =		std::unordered_map<int32_t, int>::iterator it =
	gamepadAndroidAxisToIndexMap.find(androidAxisCode);		gamepadAndroidAxisToIndexMap.find(androidAxisCode);
	if (it == gamepadAndroidToLinuxKeyMap.end()) {		if (it == gamepadAndroidAxisToIndexMap.end()) {
	return nullptr;		return nullptr;
	}		}
	return &GAMEPAD_AXES[it->second];		return &GAMEPAD_AXES[it->second];