From 7f741fddc3b5664c79f05e001461740cc0d9f3db Mon Sep 17 00:00:00 2001 From: Ted Bauer Date: Fri, 27 Sep 2024 04:22:39 +0000 Subject: Make override immediately override aconfigd To keep the behavior consistent between DeviceConfig and aconfig storage, immediately override aconfig storage when overriding DeviceConfig. Bug: 324436145 Test: manual test Change-Id: I8c65d462ad231fb27b95ef221d351650c2b7fd2c Flag: com.android.aconfig.flags.enable_only_new_storage --- .../core/java/com/android/server/am/SettingsToPropertiesMapper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java b/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java index a13ce654bb95..9153e72aec5c 100644 --- a/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java +++ b/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java @@ -497,7 +497,7 @@ public class SettingsToPropertiesMapper { proto.write(StorageRequestMessage.FlagOverrideMessage.FLAG_NAME, flagName); proto.write(StorageRequestMessage.FlagOverrideMessage.FLAG_VALUE, flagValue); proto.write(StorageRequestMessage.FlagOverrideMessage.OVERRIDE_TYPE, isLocal - ? StorageRequestMessage.LOCAL_ON_REBOOT + ? StorageRequestMessage.LOCAL_IMMEDIATE : StorageRequestMessage.SERVER_ON_REBOOT); proto.end(msgToken); proto.end(msgsToken); -- cgit v1.2.3-59-g8ed1b