Merge "Fix flag check for preserve settings feature"

2020-02-04 01:06:38 +00:00
parent 136227c473 efd9c181eb
commit a6f6b40353
1 changed files with 1 additions and 1 deletions
--- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsBackupAgent.java
+++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsBackupAgent.java
@@ -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();
        }