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

Merge "Revert "Get device_state_configuration config files from ODM partition"" am: d74f619e38 am: e3f56c2aab

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

Change-Id: I2f932264d987d95f4a9858fa74d746fb53cc9d0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Zhanglong Xia
2023-06-26 15:19:36 +00:00
committed by Automerger Merge Worker
parent 6914406050 e3f56c2aab
commit 71ca8631a8
1 changed files with 0 additions and 7 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,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()) {