diff options
| -rw-r--r-- | services/inputflinger/reader/EventHub.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/services/inputflinger/reader/EventHub.cpp b/services/inputflinger/reader/EventHub.cpp index e26bc8c6dc..e9fa599b33 100644 --- a/services/inputflinger/reader/EventHub.cpp +++ b/services/inputflinger/reader/EventHub.cpp @@ -319,10 +319,11 @@ static InputDeviceCountryCode readCountryCodeLocked(const std::filesystem::path& std::string str; if (base::ReadFileToString(sysfsRootPath / "country", &str)) { hidCountryCode = std::stoi(str, nullptr, 16); - LOG_ALWAYS_FATAL_IF(hidCountryCode > 35 || hidCountryCode < 0, - "HID country code should be in range [0, 35]. Found country code " - "to be %d", - hidCountryCode); + if (hidCountryCode > 35 || hidCountryCode < 0) { + ALOGE("HID country code should be in range [0, 35], but for sysfs path %s it was %d", + sysfsRootPath.c_str(), hidCountryCode); + return InputDeviceCountryCode::INVALID; + } } return static_cast<InputDeviceCountryCode>(hidCountryCode); |