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

Commit 6fd1705f authored by Rubin Xu's avatar Rubin Xu Committed by Android (Google) Code Review
Browse files

Merge "Fix doc for package checksum in DevicePolicyManager."

parents ab11ec39 e30ab114

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

+6 −5
Original line number Diff line number Diff line
@@ -363,10 +363,10 @@ public class DevicePolicyManager { 
        = "android.app.extra.PROVISIONING_DEVICE_ADMIN_PACKAGE_DOWNLOAD_COOKIE_HEADER";



    /**

     * A String extra holding the SHA-1 checksum of the file at download location specified in

     * {@link #EXTRA_PROVISIONING_DEVICE_ADMIN_PACKAGE_DOWNLOAD_LOCATION}. If this doesn't match

     * the file at the download location an error will be shown to the user and the user will be

     * asked to factory reset the device.

     * A String extra holding the URL-safe base64 encoded SHA-1 checksum of the file at download

     * location specified in {@link #EXTRA_PROVISIONING_DEVICE_ADMIN_PACKAGE_DOWNLOAD_LOCATION}. If

     * this doesn't match the file at the download location an error will be shown to the user and

     * the user will be asked to factory reset the device.

     *

     * <p>Use in an NFC record with {@link #MIME_TYPE_PROVISIONING_NFC} that starts device owner

     * provisioning via an NFC bump.
@@ -445,7 +445,8 @@ public class DevicePolicyManager { 
        = "android.app.extra.PROVISIONING_DEVICE_INITIALIZER_PACKAGE_DOWNLOAD_COOKIE_HEADER";



    /**

     * A String extra holding the SHA-1 checksum of the file at download location specified in

     * A String extra holding the URL-safe base64 encoded SHA-1 checksum of the file at download

     * location specified in

     * {@link #EXTRA_PROVISIONING_DEVICE_INITIALIZER_PACKAGE_DOWNLOAD_LOCATION}. If this doesn't

     * match the file at the download location an error will be shown to the user and the user will

     * be asked to factory reset the device.