commit da40cb86810f71a31fe7ac4373b455521bed6026
author Ruslan Tkhakokhov <rthakohov@google.com> Wed Apr 22 16:21:47 2020 +0100
committer Ruslan Tkhakokhov <rthakohov@google.com> Mon Apr 27 19:50:37 2020 +0000
tree 022c47acee4fbb8ea00b908aa883bc5cd0930373
parent 18f35e57473b34edaa7643c2c52771ae81fce2dc

Special-case backup/restore of replaced settings

Bug: 153940088
Test: atest SettingsProviderTest:SettingsHelperTest

Values for some settings might be changed temporarily. If a backup happens at that moment, we want to backup the real values instead of the temporary ones. If a restore happens at that moment, we don't want to restore values for modified settings. See https://b.corp.google.com/issues/153940088#comment2 for context.

Change-Id: I4866f56376ffa393220bbef828a4b876d586146b

packages/SettingsProvider/Android.bp

diff --git a/packages/SettingsProvider/Android.bp b/packages/SettingsProvider/Android.bp
index d67bd8d..9d042a4 100644
--- a/packages/SettingsProvider/Android.bp
+++ b/packages/SettingsProvider/Android.bp
@@ -34,6 +34,7 @@
     ],
     static_libs: [
         "androidx.test.rules",
+        "mockito-target-minus-junit4",
         "SettingsLibDisplayDensityUtils",
         "platform-test-annotations",
         "truth-prebuilt",