diff options
| author | 2020-10-05 20:49:32 +0000 | |
|---|---|---|
| committer | 2020-10-05 20:49:32 +0000 | |
| commit | 438264485decb4d794c3f99beb1820bfee3d1340 (patch) | |
| tree | e6ac056c44105efd4cae300b7d9c242767eebea2 | |
| parent | 1b249aae750ef7c0104f50ca83055ee160e9b546 (diff) | |
| parent | e17c4e0003dcaf7ae9bf08740174928b6ea4cb4e (diff) | |
Merge "Bluetooth: Spell mandatory correctly" am: e7899bcd32 am: e17c4e0003
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1449262
Change-Id: Ibf359c50af05c9bbfed27b97d42e1e9f2a9f9c7c
| -rw-r--r-- | core/java/android/bluetooth/BluetoothAdapter.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/bluetooth/BluetoothAdapter.java b/core/java/android/bluetooth/BluetoothAdapter.java index 3c7d8fca20a4..872c37771128 100644 --- a/core/java/android/bluetooth/BluetoothAdapter.java +++ b/core/java/android/bluetooth/BluetoothAdapter.java @@ -2529,7 +2529,7 @@ public final class BluetoothAdapter { * Create a listening, insecure RFCOMM Bluetooth socket with Service Record. * <p>The link key is not required to be authenticated, i.e the communication may be * vulnerable to Person In the Middle attacks. For Bluetooth 2.1 devices, - * the link will be encrypted, as encryption is mandartory. + * the link will be encrypted, as encryption is mandatory. * For legacy devices (pre Bluetooth 2.1 devices) the link will not * be encrypted. Use {@link #listenUsingRfcommWithServiceRecord}, if an * encrypted and authenticated communication channel is desired. @@ -2568,7 +2568,7 @@ public final class BluetoothAdapter { * an input and output capability or just has the ability to display a numeric key, * a secure socket connection is not possible and this socket can be used. * Use {@link #listenUsingInsecureRfcommWithServiceRecord}, if encryption is not required. - * For Bluetooth 2.1 devices, the link will be encrypted, as encryption is mandartory. + * For Bluetooth 2.1 devices, the link will be encrypted, as encryption is mandatory. * For more details, refer to the Security Model section 5.2 (vol 3) of * Bluetooth Core Specification version 2.1 + EDR. * <p>Use {@link BluetoothServerSocket#accept} to retrieve incoming |