Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1a3114c6 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: Ibf359c50af05c9bbfed27b97d42e1e9f2a9f9c7c
parents d6ebf007 a885e0bf

framework/java/android/bluetooth/BluetoothAdapter.java

+2 −2
Original line number Diff line number Diff line
@@ -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