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

Merge "Update documentation of DevicePolicyManager.isProvisioningAllowed." into nyc-dev

Browse Source 
am: c25c903

* commit 'c25c9032ffdca20a4080db5a1fe1e771af9256f6':
  Update documentation of DevicePolicyManager.isProvisioningAllowed.
This commit is contained in:
Nicolas Prevot
2016-03-16 12:10:27 +00:00
committed by android-build-merger
parent 63dbf9c216 c25c9032ff
commit 5490ba7279
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5555,9 +5555,6 @@ public class DevicePolicyManager {
* Returns if provisioning a managed profile or device is possible or not. * Returns if provisioning a managed profile or device is possible or not.
* @param action One of {@link #ACTION_PROVISION_MANAGED_DEVICE}, * @param action One of {@link #ACTION_PROVISION_MANAGED_DEVICE},
* {@link #ACTION_PROVISION_MANAGED_PROFILE}. * {@link #ACTION_PROVISION_MANAGED_PROFILE}.
* Note that even if this method returns true, there is a slight possibility that the
* provisioning will not be allowed when it is actually initiated because some event has
* happened in between.
* @return if provisioning a managed profile or device is possible or not. * @return if provisioning a managed profile or device is possible or not.
* @throws IllegalArgumentException if the supplied action is not valid. * @throws IllegalArgumentException if the supplied action is not valid.
*/ */