Merge "Fix the UniquePreferenceTest."

2018-01-25 19:01:11 +00:00
parent 905221568e 9f1352b4f3
commit bb2a2b9bef
1 changed files with 18 additions and 1 deletions
--- a/tests/unit/src/com/android/settings/core/UniquePreferenceTest.java
+++ b/tests/unit/src/com/android/settings/core/UniquePreferenceTest.java
@@ -74,7 +74,24 @@ public class UniquePreferenceTest {
            "toggle_bluetooth",
            "toggle_nfc",
            "android_beam_settings",
-            "sms_mirroring"
+            "sms_mirroring",
+            // Dup keys from About Phone v2 experiment.
+            "ims_reg_state",
+            "bt_address",
+            "device_model",
+            "firmware_version",
+            "regulatory_info",
+            "manual",
+            "legal_container",
+            "device_feedback",
+            "fcc_equipment_id",
+            "sim_status",
+            "build_number",
+            "phone_number",
+            "imei_info",
+            "wifi_ip_address",
+            "wifi_mac_address",
+            "safety_info"
    );

    private Context mContext;