Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 66c96334 authored by Ted Bauer's avatar Ted Bauer Committed by Automerger Merge Worker
Browse files

Merge "Update writeFlagOverrideRequest call in SettingsState" into main am:... 

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

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



Change-Id: I3ab7f6b1172be0ece6ff2d59f1df426b0a0c6b2e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 16117f24 df3552db

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

+2 −2
Original line number Diff line number Diff line
@@ -610,7 +610,7 @@ final class SettingsState { 
                                flag.getPackageName(),

                                flag.getFlagName(),

                                flag.getServerFlagValue(),

                                false);

                                StorageRequestMessage.SERVER_ON_REBOOT);

                    }



                    if (flag.getHasLocalOverride()) {
@@ -619,7 +619,7 @@ final class SettingsState { 
                                flag.getPackageName(),

                                flag.getFlagName(),

                                flag.getLocalFlagValue(),

                                true);

                                StorageRequestMessage.LOCAL_ON_REBOOT);

                    }

                }