diff options
| author | Jim Miller <jaggies@google.com> | 2015-02-25 18:23:20 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-25 18:23:20 +0000 |
| commit | b060f018effb27a79797e55f9eb6a592db2cb39a (patch) | |
| tree | 1c70798ee6969c74b07d5be998b7859e96a90d6a /core/java/android | |
| parent | c88604bcb94ce23706767bf10db24ff23a68a4b5 (diff) | |
| parent | 91aa1bdb57a82b59401afd88aaeb429ea4c73bac (diff) | |
am 91aa1bdb: am 19847b07: am b46e4806: Merge "Remove TrustAgent whitelisting API" into lmp-mr1-dev
* commit '91aa1bdb57a82b59401afd88aaeb429ea4c73bac':
Remove TrustAgent whitelisting API
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/app/admin/DevicePolicyManager.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index cf06cb75bcb2..6160bb6ca8b7 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -2698,6 +2698,7 @@ public class DevicePolicyManager { * <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. + * @hide */ public void setTrustAgentConfiguration(ComponentName admin, ComponentName target, PersistableBundle configuration) { @@ -2724,6 +2725,7 @@ public class DevicePolicyManager { * for this {@param agent} or calls it with a null configuration, null is returned. * @param agent Which component to get enabled features for. * @return configuration for the given trust agent. + * @hide */ public List<PersistableBundle> getTrustAgentConfiguration(ComponentName admin, ComponentName agent) { |