Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e687daf5 authored by Zhanglong Xia's avatar Zhanglong Xia Committed by Automerger Merge Worker
Browse files

Merge "Revert "Get device_state_configuration config files from ODM... 

Merge "Revert "Get device_state_configuration config files from ODM partition"" am: d74f619e am: e3f56c2a am: 71ca8631

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



Change-Id: I7eccaf1017dfd20d03f4ce35e6e431c3240db029
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f5805847 71ca8631

services/core/java/com/android/server/policy/DeviceStateProviderImpl.java

+0 −7
Original line number Diff line number Diff line
@@ -97,7 +97,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";
@@ -656,12 +655,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()) {