diff options
| author | 2024-09-27 12:58:55 +0000 | |
|---|---|---|
| committer | 2024-09-27 12:58:55 +0000 | |
| commit | c5dbe0401aec7633619e3596db59763d3ec6faff (patch) | |
| tree | 3c8d6fda15d68194b3934b3b73b64c6a8e1e0c7b | |
| parent | b835cc08087e391989633320b016dd9d60a5433f (diff) | |
| parent | 7f741fddc3b5664c79f05e001461740cc0d9f3db (diff) | |
Merge "Make override immediately override aconfigd" into main
| -rw-r--r-- | services/core/java/com/android/server/am/SettingsToPropertiesMapper.java | 2 |
1 files changed, 1 insertions, 1 deletions
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); |