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

Merge "Update documentation for EXTRA_SUPERVISOR_RESTRICTED_SETTING_KEY." into tm-dev am: a90ee32654

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17241351

Change-Id: I059ed2b5bf975d18d68645a598e1eb162c3bd375
This commit is contained in:
Joe Bolinger
2022-03-18 20:22:01 +00:00
committed by Automerger Merge Worker
parent f2edd27f29 a90ee32654
commit bdbbc386be
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2143,10 +2143,10 @@ public final class Settings {
/**
* Intent extra: The id of a setting restricted by supervisors.
* <p>
* Type: Integer with a value from the SupervisorVerificationSetting annotation below.
* Type: Integer with a value from the one of the SUPERVISOR_VERIFICATION_* constants below.
* <ul>
* <li>{@link #SUPERVISOR_VERIFICATION_SETTING_UNKNOWN}
* <li>{@link #SUPERVISOR_VERIFICATION_SETTING_BIOMETRICS}
* <li>{@see #SUPERVISOR_VERIFICATION_SETTING_UNKNOWN}
* <li>{@see #SUPERVISOR_VERIFICATION_SETTING_BIOMETRICS}
* </ul>
* </p>
*/
@@ -2154,12 +2154,14 @@ public final class Settings {
"android.provider.extra.SUPERVISOR_RESTRICTED_SETTING_KEY";
/**
* Unknown setting.
* The unknown setting can usually be ignored and is used for compatibility with future
* supervisor settings.
*/
public static final int SUPERVISOR_VERIFICATION_SETTING_UNKNOWN = 0;
/**
* Biometric settings for supervisors.
* Settings for supervisors to control what kinds of biometric sensors, such a face and
* fingerprint scanners, can be used on the device.
*/
public static final int SUPERVISOR_VERIFICATION_SETTING_BIOMETRICS = 1;