commit efca477259c62fa0c224833af73f279947f357ad
author Michael Groover <mpgroover@google.com> Wed Jan 23 20:10:37 2019 -0800
committer Michael Groover <mpgroover@google.com> Thu Jan 24 04:53:15 2019 +0000
tree 3f9a9f6b8a7a5347ddf42a454b224d666bddbc91
parent 96129fb7bbde75f799a367f8eb60f137671cce53

Enable device identifier check for priv apps

Bug: 117781266
Test: atest CtsTelephony3TestCases
Test: atest android.telephony.cts.TelephonyManagerTest
Test: atest android.permission.cts.telephony.TelephonyManagerPermissionTest
Change-Id: I6b54edec787779c91478277ba18744f9696e6e8b

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

diff --git a/core/tests/coretests/src/android/provider/SettingsBackupTest.java b/core/tests/coretests/src/android/provider/SettingsBackupTest.java
index 8e16ddf..c88b055 100644
--- a/core/tests/coretests/src/android/provider/SettingsBackupTest.java
+++ b/core/tests/coretests/src/android/provider/SettingsBackupTest.java
@@ -389,9 +389,8 @@
                     Settings.Global.POWER_MANAGER_CONSTANTS,
                     Settings.Global.PREFERRED_NETWORK_MODE,
                     Settings.Global.PRIVATE_DNS_DEFAULT_MODE,
-                    Settings.Global.PRIVILEGED_DEVICE_IDENTIFIER_CHECK_ENABLED,
                     Settings.Global.PRIVILEGED_DEVICE_IDENTIFIER_NON_PRIV_CHECK_RELAXED,
-                    Settings.Global.PRIVILEGED_DEVICE_IDENTIFIER_TARGET_Q_BEHAVIOR_ENABLED,
+                    Settings.Global.PRIVILEGED_DEVICE_IDENTIFIER_PRIV_CHECK_RELAXED,
                     Settings.Global.PRIVILEGED_DEVICE_IDENTIFIER_3P_CHECK_RELAXED,
                     Settings.Global.PROVISIONING_APN_ALARM_DELAY_IN_MS,
                     Settings.Global.RADIO_BLUETOOTH,