Merge "Also read compat config from system_ext."

2020-01-14 05:44:37 +00:00
parent cae0b367e0 752462f71c
commit e9e1f4a777
1 changed files with 2 additions and 0 deletions
--- a/services/core/java/com/android/server/compat/CompatConfig.java
+++ b/services/core/java/com/android/server/compat/CompatConfig.java
@@ -367,6 +367,8 @@ final class CompatConfig {
        CompatConfig config = new CompatConfig(androidBuildClassifier, context);
        config.initConfigFromLib(Environment.buildPath(
                Environment.getRootDirectory(), "etc", "compatconfig"));
+        config.initConfigFromLib(Environment.buildPath(
+                Environment.getRootDirectory(), "system_ext", "etc", "compatconfig"));
        return config;
    }