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

Commit a6f6b403 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix flag check for preserve settings feature"

parents 136227c4 efd9c181

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

+1 −1
Original line number Diff line number Diff line
@@ -626,7 +626,7 @@ public class SettingsBackupAgent extends BackupAgentHelper { 
     * Get names of the settings for which the current value should be preserved during restore.

     */

    private Set<String> getSettingsToPreserveInRestore(Uri settingsUri) {

        if (!FeatureFlagUtils.isEnabled(getApplicationContext(),

        if (!FeatureFlagUtils.isEnabled(getBaseContext(),

                FeatureFlagUtils.SETTINGS_DO_NOT_RESTORE_PRESERVED)) {

            return Collections.emptySet();

        }