diff options
| author | Jake Hamby <jhamby@google.com> | 2010-09-30 16:29:13 -0700 |
|---|---|---|
| committer | Jake Hamby <jhamby@google.com> | 2010-09-30 16:29:13 -0700 |
| commit | c242248fe9ec993dad34c81f88747bfdebe329aa (patch) | |
| tree | 17a7e9bda8fdb3df05f274c45b9e8fa395325c0b /framework/java/android/bluetooth/BluetoothAdapter.java | |
| parent | a41d275138f30a3b0e65e6a2b5c0d485da40cc0c (diff) | |
| parent | 04c7138c7c1f36d54fbe33c40644e197248166b9 (diff) | |
resolved conflicts for merge of 0a972acf to gingerbread-plus-aosp
Change-Id: Id8dc5038edc214b4433bdf690243f2f5fe5b4812
Diffstat (limited to 'framework/java/android/bluetooth/BluetoothAdapter.java')
| -rw-r--r-- | framework/java/android/bluetooth/BluetoothAdapter.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/framework/java/android/bluetooth/BluetoothAdapter.java b/framework/java/android/bluetooth/BluetoothAdapter.java index 33fd39513f..3040319beb 100644 --- a/framework/java/android/bluetooth/BluetoothAdapter.java +++ b/framework/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(); |