commit c5dbe0401aec7633619e3596db59763d3ec6faff
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Fri Sep 27 12:58:55 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Sep 27 12:58:55 2024 +0000
tree 3c8d6fda15d68194b3934b3b73b64c6a8e1e0c7b
parent b835cc08087e391989633320b016dd9d60a5433f
parent 7f741fddc3b5664c79f05e001461740cc0d9f3db

Merge "Make override immediately override aconfigd" into main

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

diff --git a/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java b/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java
index a13ce65..9153e72 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 @@
       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);