From 5ce3014bbfce1afc1af046e58e87b3e4d63728e0 Mon Sep 17 00:00:00 2001 From: Zhanglong Xia Date: Mon, 26 Jun 2023 03:13:18 +0000 Subject: [PATCH] Revert "Get device_state_configuration config files from ODM partition" This reverts commit 5647bc405ffa94b2ebdde32f2196a1cc289c77f5. Reason for revert: b/288705921 Change-Id: Ice0646bc435b6c05431966c7a97f275d919d07b0 --- .../com/android/server/policy/DeviceStateProviderImpl.java | 7 ------- 1 file changed, 7 deletions(-) diff --git a/services/core/java/com/android/server/policy/DeviceStateProviderImpl.java b/services/core/java/com/android/server/policy/DeviceStateProviderImpl.java index 4ea3dfede36bc..ced3a45935f83 100644 --- a/services/core/java/com/android/server/policy/DeviceStateProviderImpl.java +++ b/services/core/java/com/android/server/policy/DeviceStateProviderImpl.java @@ -92,7 +92,6 @@ 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"; @@ -589,12 +588,6 @@ 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()) {