Merge "Fix instrumentation tests"

2018-02-14 17:22:55 +00:00
parent 03017fc928 d2e33e73a1
commit a33ee8b349
2 changed files with 11 additions and 2 deletions
--- a/tests/unit/src/com/android/settings/core/UniquePreferenceTest.java
+++ b/tests/unit/src/com/android/settings/core/UniquePreferenceTest.java
@@ -90,7 +90,16 @@ public class UniquePreferenceTest {
            "imei_info",
            "wifi_ip_address",
            "wifi_mac_address",
-            "safety_info"
+            "safety_info",
+            // Dupe keys from data usage v2.
+            "data_usage_screen",
+            "cellular_data_usage",
+            "data_usage_wifi_screen",
+            "status_header",
+            "billing_preference",
+            "data_usage_cellular_screen",
+            "wifi_data_usage",
+            "data_usage_enable"
    );

    private Context mContext;