Fix the UniquePreferenceTest.
By adding in the About Phone v2 screen, we duplicated some settings. This isn't actually a problem because when the flag to turn on V2 is on, V1 goes away, and vice versa. Change-Id: I9aa327ac532ed2ac240bb2d6cbb327f299438889 Bug: 72459760 Test: adb shell am instrument -w -e class com.android.settings.core.UniquePreferenceTest com.android.settings.tests.unit/android.support.test.runner.AndroidJUnitRunner
This commit is contained in:
@@ -74,7 +74,24 @@ public class UniquePreferenceTest {
|
|||||||
"toggle_bluetooth",
|
"toggle_bluetooth",
|
||||||
"toggle_nfc",
|
"toggle_nfc",
|
||||||
"android_beam_settings",
|
"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;
|
private Context mContext;
|
||||||
|
Reference in New Issue
Block a user