diff options
| author | Alan Treadway <alantreadway@google.com> | 2015-08-06 15:59:43 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-06 15:59:43 +0000 |
| commit | 54f1ffcdd69ebc63d5f0d02e963b9ee7f7277786 (patch) | |
| tree | 37a135e0411d41dfc3f9d2e38e8f55a0966e630f /core/java/android | |
| parent | b9bdde13f50af73597e5b8a951da8698ee3f8fae (diff) | |
| parent | 2d1cf6278587224125da298aba42044aff1d5d8c (diff) | |
am 2d1cf627: am 190a88d2: Merge "Update documentation of DevicePolicyManager intents." into mnc-dev
* commit '2d1cf6278587224125da298aba42044aff1d5d8c':
Update documentation of DevicePolicyManager intents.
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/app/admin/DevicePolicyManager.java | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index 2d729c7d71fe..c505b0bfc6b0 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -124,6 +124,12 @@ public class DevicePolicyManager { * * <p> If provisioning fails, the managedProfile is removed so the device returns to its * previous state. + * + * <p>If launched with {@link android.app.Activity#startActivityForResult(Intent, int)} a + * result code of {@link android.app.Activity#RESULT_OK} implies that the synchronous part of + * the provisioning flow was successful, although this doesn't guarantee the full flow will + * succeed. Conversely a result code of {@link android.app.Activity#RESULT_CANCELED} implies + * that the user backed-out of provisioning, or some precondition for provisioning wasn't met. */ @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION) public static final String ACTION_PROVISION_MANAGED_PROFILE @@ -158,6 +164,10 @@ public class DevicePolicyManager { * * <p> If provisioning fails, the device is factory reset. * + * <p>A result code of {@link android.app.Activity#RESULT_OK} implies that the synchronous part + * of the provisioning flow was successful, although this doesn't guarantee the full flow will + * succeed. Conversely a result code of {@link android.app.Activity#RESULT_CANCELED} implies + * that the user backed-out of provisioning, or some precondition for provisioning wasn't met. */ @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION) public static final String ACTION_PROVISION_MANAGED_DEVICE |