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

Merge "Updating javadoc string for DevicePolicyManager.EXTRA_PROVISIONING_SUPPORT_URL to indicate that only HTTPS urls are supported." into oc-dev

Browse Source 
am: 8d41ad08c0

Change-Id: I2a0f80a5da207243aa39c6d19e0743261f655f62
This commit is contained in:
Alejandro Fernández
2017-04-05 11:31:29 +00:00
committed by android-build-merger
parent 167cee4226 8d41ad08c0
commit 91266901dc
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -697,8 +697,8 @@ public class DevicePolicyManager {
"android.app.extra.PROVISIONING_ORGANIZATION_NAME";
/**
* A String extra holding a url to the website of the device's provider. The website can be
* opened in a browser during provisioning.
* A String extra holding a url to the website of the device provider so the user can open it
* during provisioning. If the url is not HTTPS, an error will be shown.
*
* <p>Use in an intent with action {@link #ACTION_PROVISION_MANAGED_DEVICE_FROM_TRUSTED_SOURCE}
*