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

Merge "Clarify getTrustAgentConfiguration() documentation." into lmp-mr1-dev

Browse Source
This commit is contained in:
Jim Miller
2015-01-22 02:37:38 +00:00
committed by Android (Google) Code Review
parent 7de1ed9d63 b5db57a27d
commit ffd1a49c0b
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2692,7 +2692,7 @@ public class DevicePolicyManager {
* *
* @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 enabled.
* @param options TrustAgent-specific feature bundle. If null for any admin, agent * @param configuration TrustAgent-specific feature bundle. If null for any admin, agent
* will be strictly disabled according to the state of the * will be strictly disabled according to the state of the
* {@link #KEYGUARD_DISABLE_TRUST_AGENTS} flag. * {@link #KEYGUARD_DISABLE_TRUST_AGENTS} flag.
* <p>If {@link #KEYGUARD_DISABLE_TRUST_AGENTS} is set and options is not null for all admins, * <p>If {@link #KEYGUARD_DISABLE_TRUST_AGENTS} is set and options is not null for all admins,
@@ -2700,10 +2700,11 @@ public class DevicePolicyManager {
* <p>Consult documentation for the specific TrustAgent to determine legal options parameters. * <p>Consult documentation for the specific TrustAgent to determine legal options parameters.
*/ */
public void setTrustAgentConfiguration(ComponentName admin, ComponentName target, public void setTrustAgentConfiguration(ComponentName admin, ComponentName target,
PersistableBundle options) { PersistableBundle configuration) {
if (mService != null) { if (mService != null) {
try { try {
mService.setTrustAgentConfiguration(admin, target, options, UserHandle.myUserId()); mService.setTrustAgentConfiguration(admin, target, configuration,
UserHandle.myUserId());
} catch (RemoteException e) { } catch (RemoteException e) {
Log.w(TAG, "Failed talking with device policy service", e); Log.w(TAG, "Failed talking with device policy service", e);
} }
@@ -2715,7 +2716,12 @@ public class DevicePolicyManager {
* {@link #setTrustAgentConfiguration(ComponentName, ComponentName, PersistableBundle)} for * {@link #setTrustAgentConfiguration(ComponentName, ComponentName, PersistableBundle)} for
* all device admins. * all device admins.
* *
* @param admin Which {@link DeviceAdminReceiver} this request is associated with. * @param admin Which {@link DeviceAdminReceiver} this request is associated with. If null,
* this function returns a list of configurations for all admins that declare
* {@link #KEYGUARD_DISABLE_TRUST_AGENTS}. If any admin declares
* {@link #KEYGUARD_DISABLE_TRUST_AGENTS} but doesn't call
* {@link #setTrustAgentConfiguration(ComponentName, ComponentName, PersistableBundle)}
* for this {@param agent} or calls it with a null configuration, null is returned.
* @param agent Which component to get enabled features for. * @param agent Which component to get enabled features for.
* @return configuration for the given trust agent. * @return configuration for the given trust agent.
*/ */