diff options
| author | 2024-09-27 14:29:31 +0000 | |
|---|---|---|
| committer | 2024-09-27 14:29:31 +0000 | |
| commit | 2cda5d2e6d25a71ae5d7f71a34def1c0038283e3 (patch) | |
| tree | 061f736c3182f1165cf2fa8fa3f2c65dd19f84b1 | |
| parent | 4fb09dbd9e83c1415ed982276d9f8d341d0fb312 (diff) | |
| parent | 0d840015d48f426923f404e9a3058be06d9dc3c4 (diff) | |
Merge "Revert "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 9153e72aec5c..a13ce654bb95 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_IMMEDIATE + ? StorageRequestMessage.LOCAL_ON_REBOOT : StorageRequestMessage.SERVER_ON_REBOOT); proto.end(msgToken); proto.end(msgsToken); |