From 1438ccbdb8ed8966b02ea1a13966da9a1ee400b3 Mon Sep 17 00:00:00 2001 From: Hongguang Chen Date: Fri, 30 Apr 2021 09:48:49 -0700 Subject: Allow input device config files in product and system_ext. Treblization requires to locate OEM-specific configs in its own partition. So the input device config file could be located in /product/usr or /system_ext/usr. Bug: 186864233 Test: "dumpsys input" and manual testing. Change-Id: I72ca5c786ba1848edcef5c6f3ae71ce27bf8bdae --- libs/input/InputDevice.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'libs/input/InputDevice.cpp') diff --git a/libs/input/InputDevice.cpp b/libs/input/InputDevice.cpp index 31027b6476..61d72adb33 100644 --- a/libs/input/InputDevice.cpp +++ b/libs/input/InputDevice.cpp @@ -87,8 +87,10 @@ std::string getInputDeviceConfigurationFilePathByName( // Search system repository. std::string path; - // Treblized input device config files will be located /odm/usr or /vendor/usr. - const char *rootsForPartition[] {"/odm", "/vendor", getenv("ANDROID_ROOT")}; + // Treblized input device config files will be located /product/usr, /system_ext/usr, + // /odm/usr or /vendor/usr. + const char* rootsForPartition[]{"/product", "/system_ext", "/odm", "/vendor", + getenv("ANDROID_ROOT")}; for (size_t i = 0; i < size(rootsForPartition); i++) { if (rootsForPartition[i] == nullptr) { continue; -- cgit v1.2.3-59-g8ed1b