Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0496e31b authored by Alejandro Fernández's avatar Alejandro Fernández Committed by android-build-merger
Browse files

Merge "Updating javadoc string for... 

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

Change-Id: I22b145e575d20e367fcab7d0d6b8aaa0d142d732
parents e38c57c9 91266901

core/java/android/app/admin/DevicePolicyManager.java

+2 −2
Original line number Diff line number Diff line
@@ -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}

     *