Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 0f584306: Fix Bluetooth Javadoc to clarify the maximum device name length.

Browse Source 
Merge commit '0f5843069bd419fba4fb253986645dfbca0784b7' into gingerbread-plus-aosp

* commit '0f5843069bd419fba4fb253986645dfbca0784b7':
  Fix Bluetooth Javadoc to clarify the maximum device name length.
This commit is contained in:
Jake Hamby
2010-09-16 22:15:55 -07:00
committed by Android Git Automerger
parent 793b229379 0f5843069b
commit eb3b40af97
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/java/android/bluetooth/BluetoothAdapter.java
View File

@@ -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>This name is visible to remote Bluetooth devices.
* <p>Valid Bluetooth names are a maximum of 248 UTF-8 characters, however * <p>Valid Bluetooth names are a maximum of 248 bytes using UTF-8
* many remote devices can only display the first 40 characters, and some * encoding, although many remote devices can only display the first
* may be limited to just 20. * 40 characters, and some may be limited to just 20.
* <p>If Bluetooth state is not {@link #STATE_ON}, this API * <p>If Bluetooth state is not {@link #STATE_ON}, this API
* will return false. After turning on Bluetooth, * will return false. After turning on Bluetooth,
* wait for {@link #ACTION_STATE_CHANGED} with {@link #STATE_ON} * 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 * <p>The Bluetooth scan mode determines if the local adapter is
* connectable and/or discoverable from remote Bluetooth devices. * connectable and/or discoverable from remote Bluetooth devices.
* <p>Possible values are: * <p>Possible values are:
@@ -611,7 +611,7 @@ public final class BluetoothAdapter {
/** /**
* Cancel the current device discovery process. * Cancel the current device discovery process.
* <p>Requires {@link android.Manifest.permission#BLUETOOTH_ADMIN}. * <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 * adapter, this method should always be called before attempting to connect
* to a remote device with {@link * to a remote device with {@link
* android.bluetooth.BluetoothSocket#connect()}. Discovery is not managed by * android.bluetooth.BluetoothSocket#connect()}. Discovery is not managed by