Merge "Updates InputDevice.cpp to read input configs from an APEX." am: ad23373a8c am: 131d8dd638 am: 894ab92124 am: 6786e58c6b

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1836694

Change-Id: I12373bdeeccf7edcb601d1717224555bbbbcd9e1

1 files changed, 9 insertions, 2 deletions

diff --git a/libs/input/InputDevice.cpp b/libs/input/InputDevice.cpp
index 220c8e1e6e..1aec477081 100644
--- a/libs/input/InputDevice.cpp
+++ b/libs/input/InputDevice.cpp
@@ -89,8 +89,15 @@ std::string getInputDeviceConfigurationFilePathByName(
 
     // 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")};
+    // These files may also be in the com.android.input.config APEX.
+    const char* rootsForPartition[]{
+            "/product",
+            "/system_ext",
+            "/odm",
+            "/vendor",
+            "/apex/com.android.input.config/etc",
+            getenv("ANDROID_ROOT"),
+    };
     for (size_t i = 0; i < size(rootsForPartition); i++) {
         if (rootsForPartition[i] == nullptr) {
             continue;