commit 9a471b94417ff892d7d9ab445a644d4c4f204411
author Bryan Mawhinney <bryanmawhinney@google.com> Wed Feb 01 13:18:07 2017 +0000
committer Bryan Mawhinney <bryanmawhinney@google.com> Wed Feb 01 13:18:27 2017 +0000
tree 8f3a34f213477974372ea6701f2cbc2a34048a69
parent 5668955ecd3b3e79cca660b4c04f1486f7c1e586

Blacklist more settings from backup

Test: run FrameworksCoreTest
Change-Id: I1b24ee1bcdae7e0d880bdc7f69dba6be07e72f1e

core/tests/coretests/src/android/provider/SettingsTest.java

diff --git a/core/tests/coretests/src/android/provider/SettingsTest.java b/core/tests/coretests/src/android/provider/SettingsTest.java
index 3d21817..d76980a 100644
--- a/core/tests/coretests/src/android/provider/SettingsTest.java
+++ b/core/tests/coretests/src/android/provider/SettingsTest.java
@@ -244,6 +244,7 @@
                     Settings.Global.NETSTATS_UID_TAG_PERSIST_BYTES,
                     Settings.Global.NETSTATS_UID_TAG_ROTATE_AGE,
                     Settings.Global.NETWORK_AVOID_BAD_WIFI,
+                    Settings.Global.NETWORK_METERED_MULTIPATH_PREFERENCE,
                     Settings.Global.NETWORK_PREFERENCE,
                     Settings.Global.NETWORK_RECOMMENDATION_REQUEST_TIMEOUT_MS,
                     Settings.Global.NETWORK_SCORER_APP,
@@ -331,6 +332,7 @@
                     Settings.Global.WFC_IMS_MODE,
                     Settings.Global.WFC_IMS_ROAMING_ENABLED,
                     Settings.Global.WFC_IMS_ROAMING_MODE,
+                    Settings.Global.WIFI_BADGING_THRESHOLDS,
                     Settings.Global.WIFI_BOUNCE_DELAY_OVERRIDE_MS,
                     Settings.Global.WIFI_COUNTRY_CODE,
                     Settings.Global.WIFI_DEVICE_OWNER_CONFIGS_LOCKDOWN,