diff options
| author | 2014-11-13 13:59:32 +0000 | |
|---|---|---|
| committer | 2014-11-13 13:59:35 +0000 | |
| commit | 6e33f0fbb57a8afc2184bd9a1798db8bd29e680a (patch) | |
| tree | 3adcc30474468fe29f92806958867ce9edc7a97d | |
| parent | f030e66f9d8b931bf58cb36ae3a0e72c9a487d96 (diff) | |
| parent | aaf2f3e8954d3d5d01953ceb7c8f631db7412e13 (diff) | |
Merge "Add extra for account migration in the DevicePolicyMamager" into lmp-mr1-dev
| -rw-r--r-- | core/java/android/app/admin/DevicePolicyManager.java | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index 33cac75027e8..756e51ffadb6 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -149,6 +149,17 @@ public class DevicePolicyManager { = "android.app.extra.PROVISIONING_DEVICE_ADMIN_PACKAGE_NAME"; /** + * An {@link android.accounts.Account} extra holding the account to migrate during managed + * profile provisioning. If the account supplied is present in the primary user, it will be + * copied, along with its credentials to the managed profile and removed from the primary user. + * + * Use with {@link #ACTION_PROVISION_MANAGED_PROFILE}. + */ + + public static final String EXTRA_PROVISIONING_ACCOUNT_TO_MIGRATE + = "android.app.extra.PROVISIONING_ACCOUNT_TO_MIGRATE"; + + /** * A String extra that, holds the email address of the account which a managed profile is * created for. Used with {@link #ACTION_PROVISION_MANAGED_PROFILE} and * {@link DeviceAdminReceiver#ACTION_PROFILE_PROVISIONING_COMPLETE}. |