commit df3552dbccdb6677ebf2668a9bd52c8cd58c1a64
author Ted Bauer <tedbauer@google.com> Thu Oct 03 19:38:24 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Oct 03 19:38:24 2024 +0000
tree 78d018cf6d8f68715b047615f3c407af0c8db664
parent aba10406278a7766ae4fc727e73851190cda9330
parent 991063f6e22e9f8cb86268eed16bfa2921e22701

Merge "Update writeFlagOverrideRequest call in SettingsState" into main am: 991063f6e2

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3290507

Change-Id: Ib3393b045821bef392f0cc1c4b974f27d90562cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

packages/SettingsProvider/src/com/android/providers/settings/SettingsState.java

diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsState.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsState.java
index d3d30df..fc7802c 100644
--- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsState.java
+++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsState.java
@@ -586,7 +586,7 @@
                                 flag.getPackageName(),
                                 flag.getFlagName(),
                                 flag.getServerFlagValue(),
-                                false);
+                                StorageRequestMessage.SERVER_ON_REBOOT);
                     }
 
                     if (flag.getHasLocalOverride()) {
@@ -595,7 +595,7 @@
                                 flag.getPackageName(),
                                 flag.getFlagName(),
                                 flag.getLocalFlagValue(),
-                                true);
+                                StorageRequestMessage.LOCAL_ON_REBOOT);
                     }
                 }