diff options
| author | Android Build Merger (Role) <noreply-android-build-merger@google.com> | 2019-06-12 21:21:46 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-06-12 21:21:46 +0000 |
| commit | 9ca64ba7c5f587f6f943fa7bdedbc6e144e413bc (patch) | |
| tree | 6c261ddaff20b955cafd05d017bd09989360a678 /core/java/android | |
| parent | 76bf35f6b2b12cd9d15dcbdc005df10d5c8717f5 (diff) | |
| parent | faf3e373dbdf74e8ef6662c5dfa1816c75dc31ce (diff) | |
Merge "Merge "Remove settings to relax device ID access restrictions" into qt-dev am: 692a68133b" into qt-r1-dev
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/provider/Settings.java | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index d614fed6b168..abea1fac30bf 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -13596,39 +13596,6 @@ public final class Settings { "location_global_kill_switch"; /** - * If set to 1, the device identifier check will be relaxed to the previous READ_PHONE_STATE - * permission check for 3P apps. - * - * STOPSHIP: Remove this once we ship with the new device identifier check enabled. - * - * @hide - */ - public static final String PRIVILEGED_DEVICE_IDENTIFIER_3P_CHECK_RELAXED = - "privileged_device_identifier_3p_check_relaxed"; - - /** - * If set to 1, the device identifier check will be relaxed to the previous READ_PHONE_STATE - * permission check for preloaded non-privileged apps. - * - * STOPSHIP: Remove this once we ship with the new device identifier check enabled. - * - * @hide - */ - public static final String PRIVILEGED_DEVICE_IDENTIFIER_NON_PRIV_CHECK_RELAXED = - "privileged_device_identifier_non_priv_check_relaxed"; - - /** - * If set to 1, the device identifier check will be relaxed to the previous READ_PHONE_STATE - * permission check for preloaded privileged apps. - * - * STOPSHIP: Remove this once we ship with the new device identifier check enabled. - * - * @hide - */ - public static final String PRIVILEGED_DEVICE_IDENTIFIER_PRIV_CHECK_RELAXED = - "privileged_device_identifier_priv_check_relaxed"; - - /** * If set to 1, SettingsProvider's restoreAnyVersion="true" attribute will be ignored * and restoring to lower version of platform API will be skipped. * |