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

Commit 5647bc40 authored by liupengle's avatar liupengle Committed by Penglei Liu
Browse files

Get device_state_configuration config files from ODM partition 



1.For fold devices, some necessary config files must be configured in
   vendor partition.These config files will effect some phones that has
   the same Soc.
2.Odm partition is intended for hardware SKUs. For GSI, odm partition
   can keep the logic of original design manufacturers.
3.Add getting device_state_configuration.xml from odm partition.

Bug: 276181381
Change-Id: I54f7190cf9d5385cdf3cfc9f1afff05d06d9bd64
Signed-off-by: default avatarliupengle <liupenglei@xiaomi.corp-partner.google.com>
parent 3aa1e300

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

+7 −0
Original line number Diff line number Diff line
@@ -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()) {