Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Get device_state_configuration config files from ODM partition" am: e79bd4da19

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2583452

Change-Id: Ic68667e29b270d8d858019be46bf21c5928e1ec6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-06-24 13:04:50 +00:00
committed by Automerger Merge Worker
parent faf0b46228 e79bd4da19
commit 5fcdd0e4ef
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/core/java/com/android/server/policy/DeviceStateProviderImpl.java
View File

@@ -92,6 +92,7 @@ public final class DeviceStateProviderImpl implements DeviceStateProvider,
"DEFAULT", 0 /* flags */); "DEFAULT", 0 /* flags */);
private static final String VENDOR_CONFIG_FILE_PATH = "etc/devicestate/"; 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 DATA_CONFIG_FILE_PATH = "system/devicestate/";
private static final String CONFIG_FILE_NAME = "device_state_configuration.xml"; private static final String CONFIG_FILE_NAME = "device_state_configuration.xml";
private static final String FLAG_CANCEL_OVERRIDE_REQUESTS = "FLAG_CANCEL_OVERRIDE_REQUESTS"; private static final String FLAG_CANCEL_OVERRIDE_REQUESTS = "FLAG_CANCEL_OVERRIDE_REQUESTS";
@@ -588,6 +589,12 @@ public final class DeviceStateProviderImpl implements DeviceStateProvider,
return configFileFromDataDir; 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(), final File configFileFromVendorDir = Environment.buildPath(Environment.getVendorDirectory(),
VENDOR_CONFIG_FILE_PATH, CONFIG_FILE_NAME); VENDOR_CONFIG_FILE_PATH, CONFIG_FILE_NAME);
if (configFileFromVendorDir.exists()) { if (configFileFromVendorDir.exists()) {