diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-10-05 20:49:32 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-10-05 20:49:32 +0000 |
| commit | 1a3114c6a00a8da39b45eb8342e5d0410db175c3 (patch) | |
| tree | c1f1a975d8be164e6b063aae69e37515244600fe /framework/java/android/bluetooth/BluetoothAdapter.java | |
| parent | d6ebf0078329d1e3499112fa3c1af120973eeed4 (diff) | |
| parent | a885e0bf93d419ac20256bf8a5d532af6e848d1a (diff) | |
Merge "Bluetooth: Spell mandatory correctly" am: e7899bcd32 am: a885e0bf93
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1449262
Change-Id: Ibf359c50af05c9bbfed27b97d42e1e9f2a9f9c7c
Diffstat (limited to 'framework/java/android/bluetooth/BluetoothAdapter.java')
| -rw-r--r-- | framework/java/android/bluetooth/BluetoothAdapter.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/framework/java/android/bluetooth/BluetoothAdapter.java b/framework/java/android/bluetooth/BluetoothAdapter.java index 3c7d8fca20..872c377711 100644 --- a/framework/java/android/bluetooth/BluetoothAdapter.java +++ b/framework/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 |