diff options
author | Jim Miller <jaggies@google.com> | 2014-08-26 18:42:58 -0700 |
---|---|---|
committer | Jim Miller <jaggies@google.com> | 2014-08-27 14:27:49 -0700 |
commit | b1474f4432097cf20c06b471b57359ddd16fe460 (patch) | |
tree | e8522c2ed33b3f87b0ce466a6461f95a7553cde9 /core/java/android/app/admin | |
parent | e30735c7dc574ac6b40d871d2bee99eb8ecd3000 (diff) | |
download | frameworks_base-b1474f4432097cf20c06b471b57359ddd16fe460.zip frameworks_base-b1474f4432097cf20c06b471b57359ddd16fe460.tar.gz frameworks_base-b1474f4432097cf20c06b471b57359ddd16fe460.tar.bz2 |
Hide trust agent whitelisting until new API is ready.
Fixes bug 17008504
Change-Id: Ic93d52042e9b6d6f7d634f22aa04642f2da1af32
Diffstat (limited to 'core/java/android/app/admin')
-rw-r--r-- | core/java/android/app/admin/DevicePolicyManager.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index b17309f..4ff34e6 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -2526,6 +2526,7 @@ public class DevicePolicyManager { * @param agent Which component to enable features for. * @param features List of features to enable. Consult specific TrustAgent documentation for * the feature list. + * @hide */ public void setTrustAgentFeaturesEnabled(ComponentName admin, ComponentName agent, List<String> features) { @@ -2546,6 +2547,7 @@ public class DevicePolicyManager { * @param admin Which {@link DeviceAdminReceiver} this request is associated with. * @param agent Which component to get enabled features for. * @return List of enabled features. + * @hide */ public List<String> getTrustAgentFeaturesEnabled(ComponentName admin, ComponentName agent) { if (mService != null) { @@ -2653,10 +2655,10 @@ public class DevicePolicyManager { * Called by a profile or device owner to set the permitted accessibility services. When * set by a device owner or profile owner the restriction applies to all profiles of the * user the device owner or profile owner is an admin for. - * + * * By default the user can use any accessiblity service. When zero or more packages have * been added, accessiblity services that are not in the list and not part of the system - * can not be enabled by the user. + * can not be enabled by the user. * * <p> Calling with a null value for the list disables the restriction so that all services * can be used, calling with an empty list only allows the builtin system's services. |