summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Ted Bauer <tedbauer@google.com> 2024-10-03 19:38:24 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2024-10-03 19:38:24 +0000
commitdf3552dbccdb6677ebf2668a9bd52c8cd58c1a64 (patch)
tree78d018cf6d8f68715b047615f3c407af0c8db664
parentaba10406278a7766ae4fc727e73851190cda9330 (diff)
parent991063f6e22e9f8cb86268eed16bfa2921e22701 (diff)
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>
-rw-r--r--packages/SettingsProvider/src/com/android/providers/settings/SettingsState.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsState.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsState.java
index d3d30dfcea3a..fc7802c9f9da 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 @@ final class SettingsState {
flag.getPackageName(),
flag.getFlagName(),
flag.getServerFlagValue(),
- false);
+ StorageRequestMessage.SERVER_ON_REBOOT);
}
if (flag.getHasLocalOverride()) {
@@ -595,7 +595,7 @@ final class SettingsState {
flag.getPackageName(),
flag.getFlagName(),
flag.getLocalFlagValue(),
- true);
+ StorageRequestMessage.LOCAL_ON_REBOOT);
}
}