commit 66c96334c962091f3e7d90c8b9924ec1c0fe34d6
author Ted Bauer <tedbauer@google.com> Thu Oct 03 19:50:34 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Oct 03 19:50:34 2024 +0000
tree 173f46264bf357db88dc596a246a1c1b657cc990
parent 16117f24645b1fabc2f204f6a8992ae77524c7b8
parent df3552dbccdb6677ebf2668a9bd52c8cd58c1a64

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

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

Change-Id: I3ab7f6b1172be0ece6ff2d59f1df426b0a0c6b2e
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 3c634f0..011ffbc 100644
--- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsState.java
+++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsState.java
@@ -610,7 +610,7 @@
                                 flag.getPackageName(),
                                 flag.getFlagName(),
                                 flag.getServerFlagValue(),
-                                false);
+                                StorageRequestMessage.SERVER_ON_REBOOT);
                     }
 
                     if (flag.getHasLocalOverride()) {
@@ -619,7 +619,7 @@
                                 flag.getPackageName(),
                                 flag.getFlagName(),
                                 flag.getLocalFlagValue(),
-                                true);
+                                StorageRequestMessage.LOCAL_ON_REBOOT);
                     }
                 }