From 752462f71c41e5c57e1c0b154ac5cce62d48f7c1 Mon Sep 17 00:00:00 2001
From: Mathew Inwood <mathewi@google.com>
Date: Mon, 13 Jan 2020 11:33:37 +0000
Subject: [PATCH] Also read compat config from system_ext.

The google settings app produces config that lives here.

Test: Check compat changes appear in dev settings UI.
Change-Id: I578e10846ea14f30f98325c43e59d9b0f0273500
---
 services/core/java/com/android/server/compat/CompatConfig.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/services/core/java/com/android/server/compat/CompatConfig.java b/services/core/java/com/android/server/compat/CompatConfig.java
index f15d999e1006c..8d261762a19bf 100644
--- 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;
     }