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

Commit 4b027644 authored by Dennis Shen's avatar Dennis Shen
Browse files

Update device config to sys prop sync 

1, for legacy native namespaces listed, push flags to both sys prop slots:
persist.device_config.<namespace>.<flag>
persist.device_config.aconfig_flags.<namespace>.<flag>

2, for trunk stable native namespaces listed, push flags to
persist.device_config.aconfig_flags.<namespace>.<flag>

Bug: b/295379636
Change-Id: I059cf88bf2ed9a79f6a0ed9992c80c5158415f24
parent 957591ac

services/core/java/com/android/server/am/SettingsToPropertiesMapper.java

+67 −3
Original line number Diff line number Diff line
@@ -87,7 +87,6 @@ public class SettingsToPropertiesMapper { 
        DeviceConfig.NAMESPACE_CAMERA_NATIVE,

        DeviceConfig.NAMESPACE_CONFIGURATION,

        DeviceConfig.NAMESPACE_CONNECTIVITY,

        DeviceConfig.NAMESPACE_CORE_EXPERIMENTS_TEAM_INTERNAL,

        DeviceConfig.NAMESPACE_EDGETPU_NATIVE,

        DeviceConfig.NAMESPACE_INPUT_NATIVE_BOOT,

        DeviceConfig.NAMESPACE_INTELLIGENCE_CONTENT_SUGGESTIONS,
@@ -115,19 +114,29 @@ public class SettingsToPropertiesMapper { 
        NAMESPACE_TETHERING_U_OR_LATER_NATIVE

    };



    // All the aconfig flags under the listed DeviceConfig scopes will be synced to native level.

    @VisibleForTesting

    static final String[] sDeviceConfigAconfigScopes = new String[] {

        DeviceConfig.NAMESPACE_CORE_EXPERIMENTS_TEAM_INTERNAL,

    };



    private final String[] mGlobalSettings;



    private final String[] mDeviceConfigScopes;



    private final String[] mDeviceConfigAconfigScopes;



    private final ContentResolver mContentResolver;



    @VisibleForTesting

    protected SettingsToPropertiesMapper(ContentResolver contentResolver,

            String[] globalSettings,

            String[] deviceConfigScopes) {

            String[] deviceConfigScopes,

            String[] deviceConfigAconfigScopes) {

        mContentResolver = contentResolver;

        mGlobalSettings = globalSettings;

        mDeviceConfigScopes = deviceConfigScopes;

        mDeviceConfigAconfigScopes = deviceConfigAconfigScopes;

    }



    @VisibleForTesting
@@ -173,6 +182,36 @@ public class SettingsToPropertiesMapper { 
                                return;

                            }

                            setProperty(propertyName, properties.getString(key, null));



                            // for legacy namespaces, they can also be used for trunk stable

                            // purposes. so push flag also into trunk stable slot in sys prop,

                            // later all legacy usage will be refactored and the sync to old

                            // sys prop slot can be removed.

                            String aconfigPropertyName = makeAconfigFlagPropertyName(scope, key);

                            if (aconfigPropertyName == null) {

                                log("unable to construct system property for " + scope + "/"

                                        + key);

                                return;

                            }

                            setProperty(aconfigPropertyName, properties.getString(key, null));

                        }

                    });

        }



        for (String deviceConfigAconfigScope : mDeviceConfigAconfigScopes) {

            DeviceConfig.addOnPropertiesChangedListener(

                    deviceConfigAconfigScope,

                    AsyncTask.THREAD_POOL_EXECUTOR,

                    (DeviceConfig.Properties properties) -> {

                        String scope = properties.getNamespace();

                        for (String key : properties.getKeyset()) {

                            String aconfigPropertyName = makeAconfigFlagPropertyName(scope, key);

                            if (aconfigPropertyName == null) {

                                log("unable to construct system property for " + scope + "/"

                                        + key);

                                return;

                            }

                            setProperty(aconfigPropertyName, properties.getString(key, null));

                        }

                    });

        }
@@ -180,7 +219,10 @@ public class SettingsToPropertiesMapper { 


    public static SettingsToPropertiesMapper start(ContentResolver contentResolver) {

        SettingsToPropertiesMapper mapper =  new SettingsToPropertiesMapper(

                contentResolver, sGlobalSettings, sDeviceConfigScopes);

                contentResolver,

                sGlobalSettings,

                sDeviceConfigScopes,

                sDeviceConfigAconfigScopes);

        mapper.updatePropertiesFromSettings();

        return mapper;

    }
@@ -243,6 +285,28 @@ public class SettingsToPropertiesMapper { 
        return propertyName;

    }



    /**

     * system property name constructing rule for aconfig flags:

     * "persist.device_config.aconfig_flags.[category_name].[flag_name]".

     * If the name contains invalid characters or substrings for system property name,

     * will return null.

     * @param categoryName

     * @param flagName

     * @return

     */

    @VisibleForTesting

    static String makeAconfigFlagPropertyName(String categoryName, String flagName) {

        String propertyName = SYSTEM_PROPERTY_PREFIX + "aconfig_flags." +

                              categoryName + "." + flagName;



        if (!propertyName.matches(SYSTEM_PROPERTY_VALID_CHARACTERS_REGEX)

                || propertyName.contains(SYSTEM_PROPERTY_INVALID_SUBSTRING)) {

            return null;

        }



        return propertyName;

    }



    private void setProperty(String key, String value) {

        // Check if need to clear the property

        if (value == null) {

services/tests/mockingservicestests/src/com/android/server/am/SettingsToPropertiesMapperTest.java

+1 −1
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ public class SettingsToPropertiesMapperTest { 
        ).when(() -> Settings.Global.getString(any(), anyString()));



        mTestMapper = new SettingsToPropertiesMapper(

            mMockContentResolver, TEST_MAPPING, new String[] {});

            mMockContentResolver, TEST_MAPPING, new String[] {}, new String[] {});

    }



    @After