From efd9c181ebebfbb3594f48f7f9542f98726c87b8 Mon Sep 17 00:00:00 2001 From: Ruslan Tkhakokhov Date: Mon, 3 Feb 2020 23:44:34 +0000 Subject: [PATCH] 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 --- .../src/com/android/providers/settings/SettingsBackupAgent.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsBackupAgent.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsBackupAgent.java index 3c52f543c81bc..44864a61ade69 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 getSettingsToPreserveInRestore(Uri settingsUri) { - if (!FeatureFlagUtils.isEnabled(getApplicationContext(), + if (!FeatureFlagUtils.isEnabled(getBaseContext(), FeatureFlagUtils.SETTINGS_DO_NOT_RESTORE_PRESERVED)) { return Collections.emptySet(); }