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

Merge "Bluetooth: Spell mandatory correctly" am: e7899bcd32 am: e17c4e0003

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1449262

Change-Id: Ibf359c50af05c9bbfed27b97d42e1e9f2a9f9c7c
This commit is contained in:
Treehugger Robot
2020-10-05 20:49:32 +00:00
committed by Automerger Merge Worker
parent 1b249aae75 e17c4e0003
commit 438264485d
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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