Merge "Get device_state_configuration config files from ODM partition"

1 files changed, 7 insertions, 0 deletions

diff --git a/services/core/java/com/android/server/policy/DeviceStateProviderImpl.java b/services/core/java/com/android/server/policy/DeviceStateProviderImpl.java
index ced3a45935f8..4ea3dfede36b 100644
--- a/services/core/java/com/android/server/policy/DeviceStateProviderImpl.java
+++ b/services/core/java/com/android/server/policy/DeviceStateProviderImpl.java
@@ -92,6 +92,7 @@ public final class DeviceStateProviderImpl implements DeviceStateProvider,
             "DEFAULT", 0 /* flags */);
 
     private static final String VENDOR_CONFIG_FILE_PATH = "etc/devicestate/";
+    private static final String ODM_CONFIG_FILE_PATH = "etc/devicestate/";
     private static final String DATA_CONFIG_FILE_PATH = "system/devicestate/";
     private static final String CONFIG_FILE_NAME = "device_state_configuration.xml";
     private static final String FLAG_CANCEL_OVERRIDE_REQUESTS = "FLAG_CANCEL_OVERRIDE_REQUESTS";
@@ -588,6 +589,12 @@ public final class DeviceStateProviderImpl implements DeviceStateProvider,
             return configFileFromDataDir;
         }
 
+        final File configFileFromOdmDir = Environment.buildPath(Environment.getOdmDirectory(),
+                ODM_CONFIG_FILE_PATH, CONFIG_FILE_NAME);
+        if (configFileFromOdmDir.exists()) {
+            return configFileFromOdmDir;
+        }
+
         final File configFileFromVendorDir = Environment.buildPath(Environment.getVendorDirectory(),
                 VENDOR_CONFIG_FILE_PATH, CONFIG_FILE_NAME);
         if (configFileFromVendorDir.exists()) {