diff options
| author | Craig Lafayette <craiglafa@google.com> | 2015-03-24 12:19:34 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-03-24 12:19:35 +0000 |
| commit | 1cef4196886b0cc1238111d396c1e3665a5fd2ae (patch) | |
| tree | 23daf1f9b1e8090f2f7312babe480db3d627f159 /core/java/android | |
| parent | a7b212d9f10bb4f2b7fb2f926587f6e904a85579 (diff) | |
| parent | 97e473e1e19f4338f15395e5b371171fcd6e23ab (diff) | |
| download | frameworks_base-1cef4196886b0cc1238111d396c1e3665a5fd2ae.zip frameworks_base-1cef4196886b0cc1238111d396c1e3665a5fd2ae.tar.gz frameworks_base-1cef4196886b0cc1238111d396c1e3665a5fd2ae.tar.bz2 | |
Merge "Add Bluetooth connection extras to DPM."
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/app/admin/DevicePolicyManager.java | 44 |
1 files changed, 44 insertions, 0 deletions
diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index 2797bf0..6dde07b 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -457,6 +457,50 @@ public class DevicePolicyManager { = "android.app.extra.PROVISIONING_DEVICE_INITIALIZER_PACKAGE_CHECKSUM"; /** + * A String extra holding the MAC address of the Bluetooth device to connect to with status + * updates during provisioning. + * + * <p>Use in an NFC record with {@link #MIME_TYPE_PROVISIONING_NFC} that starts device owner + * provisioning via an NFC bump. + */ + public static final String EXTRA_PROVISIONING_BT_MAC_ADDRESS + = "android.app.extra.PROVISIONING_BT_MAC_ADDRESS"; + + /** + * A String extra holding the Bluetooth service UUID on the device to connect to with status + * updates during provisioning. + * + * <p>This value must be specified when {@code #EXTRA_PROVISIONING_BT_MAC_ADDRESS} is present. + * + * <p>Use in an NFC record with {@link #MIME_TYPE_PROVISIONING_NFC} that starts device owner + * provisioning via an NFC bump. + */ + public static final String EXTRA_PROVISIONING_BT_UUID + = "android.app.extra.PROVISIONING_BT_UUID"; + + /** + * A String extra holding a unique identifier used to identify the device connecting over + * Bluetooth. This identifier will be part of every status message sent to the remote device. + * + * <p>This value must be specified when {@code #EXTRA_PROVISIONING_BT_MAC_ADDRESS} is present. + * + * <p>Use in an NFC record with {@link #MIME_TYPE_PROVISIONING_NFC} that starts device owner + * provisioning via an NFC bump. + */ + public static final String EXTRA_PROVISIONING_BT_DEVICE_ID + = "android.app.extra.PROVISIONING_BT_DEVICE_ID"; + + /** + * A Boolean extra that that will cause a provisioned device to temporarily proxy network + * traffic over Bluetooth. When a Wi-Fi network is available, the network proxy will stop. + * + * <p>Use in an NFC record with {@link #MIME_TYPE_PROVISIONING_NFC} that starts device owner + * provisioning via an NFC bump. + */ + public static final String EXTRA_PROVISIONING_BT_USE_PROXY + = "android.app.extra.PROVISIONING_BT_USE_PROXY"; + + /** * This MIME type is used for starting the Device Owner provisioning. * * <p>During device owner provisioning a device admin app is set as the owner of the device. |