summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Ruslan Tkhakokhov <rthakohov@google.com> 2020-02-03 23:44:34 +0000
committer Ruslan Tkhakokhov <rthakohov@google.com> 2020-02-03 23:44:34 +0000
commitefd9c181ebebfbb3594f48f7f9542f98726c87b8 (patch)
tree42aff323b3d62cfa3807bd3be4acc1b9dbf9ced4
parent2b1f4315b0e6cde0a0c1dd42e5caf2ecd2d2441a (diff)
Fix flag check for preserve settings feature
getApplicationContext() returns null when calling to get Context object to pass to FeatureFlagUtils.isEnabled(). Replace with getBaseContext() Test: Verify the context is not null through logs Change-Id: I0c27c5bc09e3fc84abeafb0a4ead3357cacc3d2a
-rw-r--r--packages/SettingsProvider/src/com/android/providers/settings/SettingsBackupAgent.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsBackupAgent.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsBackupAgent.java
index 3c52f543c81b..44864a61ade6 100644
--- 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();
}