summaryrefslogtreecommitdiffstats
path: root/core/java/android/bluetooth/BluetoothAdapter.java
diff options
context:
space:
mode:
authorJake Hamby <jhamby@google.com>2010-09-21 13:39:53 -0700
committerJake Hamby <jhamby@google.com>2010-09-30 15:43:34 -0700
commitf51eadaf1f83abfe16a609a4ded6d789494689b2 (patch)
treea004b337ba44a0bda0d2ba2411b43d091d42850c /core/java/android/bluetooth/BluetoothAdapter.java
parent99f8c5ee621d78a24583a10e459ba40aab511a17 (diff)
downloadframeworks_base-f51eadaf1f83abfe16a609a4ded6d789494689b2.zip
frameworks_base-f51eadaf1f83abfe16a609a4ded6d789494689b2.tar.gz
frameworks_base-f51eadaf1f83abfe16a609a4ded6d789494689b2.tar.bz2
Typo fixes in comments and minor code cleanups.
* Fix some typos in Javadoc and log messages. * Remove redundant initializer in BluetoothAdapter.readOutOfBandData() * Use canonical "UTF-8" charset name instead of "UTF8" in BluetoothDevice.convertPinToBytes() Change-Id: I58cd5dc48a7ad0053d204c5f590b4b3d438d8672
Diffstat (limited to 'core/java/android/bluetooth/BluetoothAdapter.java')
-rw-r--r--core/java/android/bluetooth/BluetoothAdapter.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/core/java/android/bluetooth/BluetoothAdapter.java b/core/java/android/bluetooth/BluetoothAdapter.java
index 33fd395..3040319 100644
--- a/core/java/android/bluetooth/BluetoothAdapter.java
+++ b/core/java/android/bluetooth/BluetoothAdapter.java
@@ -285,7 +285,7 @@ public final class BluetoothAdapter {
private static final int ADDRESS_LENGTH = 17;
/**
- * Lazyily initialized singleton. Guaranteed final after first object
+ * Lazily initialized singleton. Guaranteed final after first object
* constructed.
*/
private static BluetoothAdapter sAdapter;
@@ -410,7 +410,7 @@ public final class BluetoothAdapter {
* user action to turn off Bluetooth.
* <p>This gracefully shuts down all Bluetooth connections, stops Bluetooth
* system services, and powers down the underlying Bluetooth hardware.
- * <p class="caution"><strong>Bluetooth should never be disbled without
+ * <p class="caution"><strong>Bluetooth should never be disabled without
* direct user consent</strong>. The {@link #disable()} method is
* provided only for applications that include a user interface for changing
* system settings, such as a "power manager" app.</p>
@@ -876,8 +876,8 @@ public final class BluetoothAdapter {
public Pair<byte[], byte[]> readOutOfBandData() {
if (getState() != STATE_ON) return null;
try {
- byte[] hash = new byte[16];
- byte[] randomizer = new byte[16];
+ byte[] hash;
+ byte[] randomizer;
byte[] ret = mService.readOutOfBandData();