Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove settings to relax device ID access restrictions" into qt-dev

Browse Source 
am: 692a68133b

Change-Id: I3312fae325c593aef750c80cbd4365dfd2669f6c
This commit is contained in:
Michael Groover
2019-06-12 14:20:22 -07:00
committed by android-build-merger
parent 24046b674c 692a68133b
commit faf3e373db
3 changed files with 32 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
core/java/android/provider/Settings.java
View File

@@ -13595,39 +13595,6 @@ public final class Settings {
public static final String LOCATION_GLOBAL_KILL_SWITCH =
"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.