diff options
| author | Ruslan Tkhakokhov <rthakohov@google.com> | 2020-01-27 09:26:40 +0000 |
|---|---|---|
| committer | Ruslan Tkhakokhov <rthakohov@google.com> | 2020-01-27 13:01:28 +0000 |
| commit | 6fb2bb1b4231ff2ed032889dc562dbb1239b3594 (patch) | |
| tree | 37d5247a2b62d6bc89613bdff14f55896b919ac0 /core/java | |
| parent | ada833f4e6159816477fdf188b636500506a9dd8 (diff) | |
Guard the preserve settings logic in SettingsBackupAgent with a flag
The flag will guard the feature in R and can be removed in the next
release.
Bug: 144838882
Test: atest SettingsBackupAgentTest
Change-Id: I259a3f41304c40d8aac5ab5e4d24ae1027914b56
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/util/FeatureFlagUtils.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/core/java/android/util/FeatureFlagUtils.java b/core/java/android/util/FeatureFlagUtils.java index 06fccaf8ea81..6742281dc2b6 100644 --- a/core/java/android/util/FeatureFlagUtils.java +++ b/core/java/android/util/FeatureFlagUtils.java @@ -47,6 +47,9 @@ public class FeatureFlagUtils { /** @hide */ public static final String BACKUP_NO_KV_DATA_CHANGE_CALLS = "backup_enable_no_data_notification_calls"; + /** @hide */ + public static final String SETTINGS_DO_NOT_RESTORE_PRESERVED = + "settings_do_not_restore_preserved"; private static final Map<String, String> DEFAULT_FLAGS; @@ -68,6 +71,9 @@ public class FeatureFlagUtils { // Disabled until backup transports support it. DEFAULT_FLAGS.put(BACKUP_NO_KV_DATA_CHANGE_CALLS, "false"); + // Disabled by default until b/148278926 is resolved. This flags guards a feature + // introduced in R and will be removed in the next release (b/148367230). + DEFAULT_FLAGS.put(SETTINGS_DO_NOT_RESTORE_PRESERVED, "false"); } /** |