diff options
| -rw-r--r-- | services/core/java/com/android/server/am/SettingsToPropertiesMapper.java | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java b/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java index c82933c5069e..c99e8c8ff799 100644 --- a/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java +++ b/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java @@ -382,6 +382,12 @@ public class SettingsToPropertiesMapper { newSingleThreadScheduledExecutor(), (DeviceConfig.Properties properties) -> { + // send prop stage request to new storage + if (enableAconfigStorageDaemon()) { + stageFlagsInNewStorage(properties); + return; + } + for (String flagName : properties.getKeyset()) { String flagValue = properties.getString(flagName, null); if (flagName == null || flagValue == null) { @@ -409,11 +415,6 @@ public class SettingsToPropertiesMapper { setProperty(propertyName, flagValue); } - // send prop stage request to new storage - if (enableAconfigStorageDaemon()) { - stageFlagsInNewStorage(properties); - } - }); // add prop sync callback for flag local overrides @@ -423,6 +424,7 @@ public class SettingsToPropertiesMapper { (DeviceConfig.Properties properties) -> { if (enableAconfigStorageDaemon()) { setLocalOverridesInNewStorage(properties); + return; } if (Flags.supportLocalOverridesSysprops()) { |