diff options
| author | Jake Hamby <jhamby@google.com> | 2010-09-16 22:15:55 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-16 22:15:55 -0700 |
| commit | a41d275138f30a3b0e65e6a2b5c0d485da40cc0c (patch) | |
| tree | e1daf053177f49bf1b062bc4113338c781f3684e /framework/java/android/bluetooth/BluetoothAdapter.java | |
| parent | 99dcd45efc6c612bf09a0d2e6f50c30d3f0e2d69 (diff) | |
| parent | c7e8488fc4a1b3f5bcfbfba153be079fded7cdaa (diff) | |
am c7e8488f: Fix Bluetooth Javadoc to clarify the maximum device name length.
Merge commit 'c7e8488fc4a1b3f5bcfbfba153be079fded7cdaa' into gingerbread-plus-aosp
* commit 'c7e8488fc4a1b3f5bcfbfba153be079fded7cdaa':
Fix Bluetooth Javadoc to clarify the maximum device name length.
Diffstat (limited to 'framework/java/android/bluetooth/BluetoothAdapter.java')
| -rw-r--r-- | framework/java/android/bluetooth/BluetoothAdapter.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/framework/java/android/bluetooth/BluetoothAdapter.java b/framework/java/android/bluetooth/BluetoothAdapter.java index 16a8c571f4..33fd39513f 100644 --- a/framework/java/android/bluetooth/BluetoothAdapter.java +++ b/framework/java/android/bluetooth/BluetoothAdapter.java @@ -465,11 +465,11 @@ public final class BluetoothAdapter { } /** - * Set the friendly Bluetooth name of the local Bluetoth adapter. + * Set the friendly Bluetooth name of the local Bluetooth adapter. * <p>This name is visible to remote Bluetooth devices. - * <p>Valid Bluetooth names are a maximum of 248 UTF-8 characters, however - * many remote devices can only display the first 40 characters, and some - * may be limited to just 20. + * <p>Valid Bluetooth names are a maximum of 248 bytes using UTF-8 + * encoding, although many remote devices can only display the first + * 40 characters, and some may be limited to just 20. * <p>If Bluetooth state is not {@link #STATE_ON}, this API * will return false. After turning on Bluetooth, * wait for {@link #ACTION_STATE_CHANGED} with {@link #STATE_ON} @@ -488,7 +488,7 @@ public final class BluetoothAdapter { } /** - * Get the current Bluetooth scan mode of the local Bluetooth adaper. + * Get the current Bluetooth scan mode of the local Bluetooth adapter. * <p>The Bluetooth scan mode determines if the local adapter is * connectable and/or discoverable from remote Bluetooth devices. * <p>Possible values are: @@ -611,7 +611,7 @@ public final class BluetoothAdapter { /** * Cancel the current device discovery process. * <p>Requires {@link android.Manifest.permission#BLUETOOTH_ADMIN}. - * <p>Because discovery is a heavyweight precedure for the Bluetooth + * <p>Because discovery is a heavyweight procedure for the Bluetooth * adapter, this method should always be called before attempting to connect * to a remote device with {@link * android.bluetooth.BluetoothSocket#connect()}. Discovery is not managed by |