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

Merge "Clarify javadoc for DevicePolicyManager.setTrustAgentConfiguration" into pi-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2018-03-07 16:27:14 +00:00
committed by Android (Google) Code Review
parent 6e0e705844 50ac241221
commit a3e2d2fed8
1 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
core/java/android/app/admin/DevicePolicyManager.java
View File

@@ -3734,8 +3734,10 @@ public class DevicePolicyManager {
public static final int KEYGUARD_DISABLE_UNREDACTED_NOTIFICATIONS = 1 << 3; public static final int KEYGUARD_DISABLE_UNREDACTED_NOTIFICATIONS = 1 << 3;
/** /**
* Ignore trust agent state on secure keyguard screens * Disable trust agents on secure keyguard screens (e.g. PIN/Pattern/Password).
* (e.g. PIN/Pattern/Password). * By setting this flag alone, all trust agents are disabled. If the admin then wants to
* whitelist specific features of some trust agent, {@link #setTrustAgentConfiguration} can be
* used in conjuction to set trust-agent-specific configurations.
*/ */
public static final int KEYGUARD_DISABLE_TRUST_AGENTS = 1 << 4; public static final int KEYGUARD_DISABLE_TRUST_AGENTS = 1 << 4;
@@ -5796,11 +5798,20 @@ public class DevicePolicyManager {
} }
/** /**
* Sets a list of configuration features to enable for a TrustAgent component. This is meant to * Sets a list of configuration features to enable for a trust agent component. This is meant to
* be used in conjunction with {@link #KEYGUARD_DISABLE_TRUST_AGENTS}, which disables all trust * be used in conjunction with {@link #KEYGUARD_DISABLE_TRUST_AGENTS}, which disables all trust
* agents but those enabled by this function call. If flag * agents but those enabled by this function call. If flag
* {@link #KEYGUARD_DISABLE_TRUST_AGENTS} is not set, then this call has no effect. * {@link #KEYGUARD_DISABLE_TRUST_AGENTS} is not set, then this call has no effect.
* <p> * <p>
* For any specific trust agent, whether it is disabled or not depends on the aggregated state
* of each admin's {@link #KEYGUARD_DISABLE_TRUST_AGENTS} setting and its trust agent
* configuration as set by this function call. In particular: if any admin sets
* {@link #KEYGUARD_DISABLE_TRUST_AGENTS} and does not additionally set any
* trust agent configuration, the trust agent is disabled completely. Otherwise, the trust agent
* will receive the list of configurations from all admins who set
* {@link #KEYGUARD_DISABLE_TRUST_AGENTS} and aggregate the configurations to determine its
* behavior. The exact meaning of aggregation is trust-agent-specific.
* <p>
* The calling device admin must have requested * The calling device admin must have requested
* {@link DeviceAdminInfo#USES_POLICY_DISABLE_KEYGUARD_FEATURES} to be able to call this method; * {@link DeviceAdminInfo#USES_POLICY_DISABLE_KEYGUARD_FEATURES} to be able to call this method;
* if not, a security exception will be thrown. * if not, a security exception will be thrown.
@@ -5810,17 +5821,10 @@ public class DevicePolicyManager {
* the parent profile. * the parent profile.
* *
* @param admin Which {@link DeviceAdminReceiver} this request is associated with. * @param admin Which {@link DeviceAdminReceiver} this request is associated with.
* @param target Component name of the agent to be enabled. * @param target Component name of the agent to be configured.
* @param configuration TrustAgent-specific feature bundle. If null for any admin, agent will be * @param configuration Trust-agent-specific feature configuration bundle. Please consult
* strictly disabled according to the state of the * documentation of the specific trust agent to determine the interpretation of this
* {@link #KEYGUARD_DISABLE_TRUST_AGENTS} flag. * bundle.
* <p>
* If {@link #KEYGUARD_DISABLE_TRUST_AGENTS} is set and options is not null for all
* admins, then it's up to the TrustAgent itself to aggregate the values from all
* device admins.
* <p>
* Consult documentation for the specific TrustAgent to determine legal options
* parameters.
* @throws SecurityException if {@code admin} is not an active administrator or does not use * @throws SecurityException if {@code admin} is not an active administrator or does not use
* {@link DeviceAdminInfo#USES_POLICY_DISABLE_KEYGUARD_FEATURES} * {@link DeviceAdminInfo#USES_POLICY_DISABLE_KEYGUARD_FEATURES}
*/ */