diff options
| author | Jake Hamby <jhamby@google.com> | 2010-09-30 19:33:43 -0700 |
|---|---|---|
| committer | Jake Hamby <jhamby@google.com> | 2010-09-30 19:33:43 -0700 |
| commit | 980d40b568bf976eed8de7c035c2e30ddc67fa89 (patch) | |
| tree | bec0231a831ddc6f1303c871316c593d50c0bf39 /core/java/android/bluetooth/BluetoothAdapter.java | |
| parent | 37ece16cdc87b33c022986a66ae1c4cc50e65936 (diff) | |
| parent | 738aadd70fb96491e34645e78241eeb04ee83460 (diff) | |
| download | frameworks_base-980d40b568bf976eed8de7c035c2e30ddc67fa89.zip frameworks_base-980d40b568bf976eed8de7c035c2e30ddc67fa89.tar.gz frameworks_base-980d40b568bf976eed8de7c035c2e30ddc67fa89.tar.bz2 | |
resolved conflicts for merge of 738aadd7 to master
Change-Id: I8810cc6dbd532de002d6a623ad93e86afb48c0b4
Diffstat (limited to 'core/java/android/bluetooth/BluetoothAdapter.java')
| -rw-r--r-- | core/java/android/bluetooth/BluetoothAdapter.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/core/java/android/bluetooth/BluetoothAdapter.java b/core/java/android/bluetooth/BluetoothAdapter.java index 21a4bd6..c66b2de 100644 --- a/core/java/android/bluetooth/BluetoothAdapter.java +++ b/core/java/android/bluetooth/BluetoothAdapter.java @@ -341,7 +341,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; @@ -466,7 +466,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> @@ -932,8 +932,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(); |