diff options
| author | Sander Alewijnse <salewijnse@google.com> | 2014-07-28 13:07:39 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-07-24 15:36:04 +0000 |
| commit | af9f8aed7d3955b0d1c75943290467f39c7a7681 (patch) | |
| tree | 8fa24e20e47198540f6f1dbc2e37fb3964400b52 /core/java/android/app/admin | |
| parent | fa1b678665e4ca93719a950f5b58dd5d611a29fb (diff) | |
| parent | 681bce94df324ef84a804131691b6c33119197c4 (diff) | |
| download | frameworks_base-af9f8aed7d3955b0d1c75943290467f39c7a7681.zip frameworks_base-af9f8aed7d3955b0d1c75943290467f39c7a7681.tar.gz frameworks_base-af9f8aed7d3955b0d1c75943290467f39c7a7681.tar.bz2 | |
Merge "Add http cookie header key as a provisioning extra." into lmp-dev
Diffstat (limited to 'core/java/android/app/admin')
| -rw-r--r-- | core/java/android/app/admin/DevicePolicyManager.java | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index 1f2f18a..2d4903c 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -273,6 +273,16 @@ public class DevicePolicyManager { = "android.app.extra.deviceAdminPackageDownloadLocation"; /** + * A String extra holding a http cookie header which should be used in the http request to the + * url specified in {@link #EXTRA_PROVISIONING_DEVICE_ADMIN_PACKAGE_DOWNLOAD_LOCATION}. + * + * <p>Use in an Nfc record with {@link #PROVISIONING_NFC_MIME_TYPE} that starts device owner + * provisioning via an Nfc bump. + */ + public static final String EXTRA_PROVISIONING_DEVICE_ADMIN_PACKAGE_DOWNLOAD_COOKIE_HEADER + = "android.app.extra.deviceAdminPackageDownloadCookieHeader"; + + /** * 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 @@ -302,6 +312,7 @@ public class DevicePolicyManager { * <ul> * <li>{@link #EXTRA_PROVISIONING_DEVICE_ADMIN_PACKAGE_NAME}</li> * <li>{@link #EXTRA_PROVISIONING_DEVICE_ADMIN_PACKAGE_DOWNLOAD_LOCATION}</li> + * <li>{@link #EXTRA_PROVISIONING_DEVICE_ADMIN_PACKAGE_DOWNLOAD_COOKIE_HEADER}, optional</li> * <li>{@link #EXTRA_PROVISIONING_DEVICE_ADMIN_PACKAGE_CHECKSUM}</li> * <li>{@link #EXTRA_PROVISIONING_LOCAL_TIME} (convert to String), optional</li> * <li>{@link #EXTRA_PROVISIONING_TIME_ZONE}, optional</li> |