diff options
| author | Jim Miller <jaggies@google.com> | 2015-02-25 18:09:37 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-25 18:09:37 +0000 |
| commit | 04d3e55c95ac4b0f13ef037aab389bc2b776b4de (patch) | |
| tree | e32236a997c28c6e4b64fc297998071c1bb625c8 /core/java | |
| parent | e084c48862aecc7ab15873b3c017bca4eb47937a (diff) | |
| parent | b46e48067fd03b63fa5f5191651ac2a5d009e226 (diff) | |
| download | frameworks_base-04d3e55c95ac4b0f13ef037aab389bc2b776b4de.zip frameworks_base-04d3e55c95ac4b0f13ef037aab389bc2b776b4de.tar.gz frameworks_base-04d3e55c95ac4b0f13ef037aab389bc2b776b4de.tar.bz2 | |
am b46e4806: Merge "Remove TrustAgent whitelisting API" into lmp-mr1-dev
* commit 'b46e48067fd03b63fa5f5191651ac2a5d009e226':
Remove TrustAgent whitelisting API
Diffstat (limited to 'core/java')
| -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 cf06cb7..6160bb6 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) { |