diff options
| -rw-r--r-- | core/java/android/app/admin/DevicePolicyManager.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index 321957e9b9e8..0a2b42121545 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -1811,10 +1811,6 @@ public class DevicePolicyManager { * #EXTRA_PROVISIONING_ALLOWED_PROVISIONING_MODES} array extra contain {@link * #PROVISIONING_MODE_MANAGED_PROFILE} and {@link #PROVISIONING_MODE_FULLY_MANAGED_DEVICE}. * - * <p>Also, if this flag is set, the admin app's {@link #ACTION_GET_PROVISIONING_MODE} activity - * will not receive the {@link #EXTRA_PROVISIONING_IMEI} and {@link - * #EXTRA_PROVISIONING_SERIAL_NUMBER} extras. - * * <p>This flag can be combined with {@link #FLAG_SUPPORTED_MODES_PERSONALLY_OWNED}. In * that case, the admin app's {@link #ACTION_GET_PROVISIONING_MODE} activity will have * the {@link #EXTRA_PROVISIONING_ALLOWED_PROVISIONING_MODES} array extra contain {@link @@ -1834,6 +1830,10 @@ public class DevicePolicyManager { * activity to have the {@link #EXTRA_PROVISIONING_ALLOWED_PROVISIONING_MODES} array extra * contain only {@link #PROVISIONING_MODE_MANAGED_PROFILE}. * + * <p>Also, if this flag is set, the admin app's {@link #ACTION_GET_PROVISIONING_MODE} activity + * will not receive the {@link #EXTRA_PROVISIONING_IMEI} and {@link + * #EXTRA_PROVISIONING_SERIAL_NUMBER} extras. + * * <p>This flag can be combined with {@link #FLAG_SUPPORTED_MODES_ORGANIZATION_OWNED}. In * that case, the admin app's {@link #ACTION_GET_PROVISIONING_MODE} activity will have the * {@link #EXTRA_PROVISIONING_ALLOWED_PROVISIONING_MODES} array extra contain {@link |