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

Commit 7d4e7a0e authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Automerger Merge Worker
Browse files

Merge changes from topic "sep11" am: c0b288133a am: 58d54530 

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

Change-Id: I7da537200efe31e803234bd1a0236843064186c8
parents b5ee4848 58d54530

framework/java/android/bluetooth/BluetoothAdapter.java

+5 −5
Original line number Diff line number Diff line
@@ -2470,7 +2470,7 @@ public final class BluetoothAdapter { 
     * {@link #SOCKET_CHANNEL_AUTO_STATIC_NO_SDP} as channel number.

     *

     * @param channel RFCOMM channel to listen on

     * @param mitm enforce man-in-the-middle protection for authentication.

     * @param mitm enforce person-in-the-middle protection for authentication.

     * @param min16DigitPin enforce a pin key length og minimum 16 digit for sec mode 2

     * connections.

     * @return a listening RFCOMM BluetoothServerSocket
@@ -2528,7 +2528,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 Man In the Middle attacks. For Bluetooth 2.1 devices,

     * vulnerable to Person In the Middle attacks. For Bluetooth 2.1 devices,

     * the link will be encrypted, as encryption is mandartory.

     * For legacy devices (pre Bluetooth 2.1 devices) the link will not

     * be encrypted. Use {@link #listenUsingRfcommWithServiceRecord}, if an
@@ -2561,7 +2561,7 @@ public final class BluetoothAdapter { 
     * Create a listening, encrypted,

     * RFCOMM Bluetooth socket with Service Record.

     * <p>The link will be encrypted, but the link key is not required to be authenticated

     * i.e the communication is vulnerable to Man In the Middle attacks. Use

     * i.e the communication is vulnerable to Person In the Middle attacks. Use

     * {@link #listenUsingRfcommWithServiceRecord}, to ensure an authenticated link key.

     * <p> Use this socket if authentication of link key is not possible.

     * For example, for Bluetooth 2.1 devices, if any of the devices does not have
@@ -2646,7 +2646,7 @@ public final class BluetoothAdapter { 
     * {@link #SOCKET_CHANNEL_AUTO_STATIC_NO_SDP} as port number.

     *

     * @param port the PSM to listen on

     * @param mitm enforce man-in-the-middle protection for authentication.

     * @param mitm enforce person-in-the-middle protection for authentication.

     * @param min16DigitPin enforce a pin key length og minimum 16 digit for sec mode 2

     * connections.

     * @return An L2CAP BluetoothServerSocket
@@ -3347,7 +3347,7 @@ public final class BluetoothAdapter { 
     * assign a dynamic PSM value. This socket can be used to listen for incoming connections. The

     * supported Bluetooth transport is LE only.

     * <p>The link key is not required to be authenticated, i.e the communication may be vulnerable

     * to man-in-the-middle attacks. Use {@link #listenUsingL2capChannel}, if an encrypted and

     * to person-in-the-middle attacks. Use {@link #listenUsingL2capChannel}, if an encrypted and

     * authenticated communication channel is desired.

     * <p>Use {@link BluetoothServerSocket#accept} to retrieve incoming connections from a listening

     * {@link BluetoothServerSocket}.

framework/java/android/bluetooth/BluetoothDevice.java

+6 −6
Original line number Diff line number Diff line
@@ -1813,7 +1813,7 @@ public final class BluetoothDevice implements Parcelable { 
     * socket will be encrypted.

     * <p> Use this socket only if an authenticated socket link is possible.

     * Authentication refers to the authentication of the link key to

     * prevent man-in-the-middle type of attacks.

     * prevent person-in-the-middle type of attacks.

     * For example, for Bluetooth 2.1 devices, if any of the devices does not

     * have an input and output capability or just has the ability to

     * display a numeric key, a secure socket connection is not possible.
@@ -1848,7 +1848,7 @@ public final class BluetoothDevice implements Parcelable { 
     * socket will be encrypted.

     * <p> Use this socket only if an authenticated socket link is possible.

     * Authentication refers to the authentication of the link key to

     * prevent man-in-the-middle type of attacks.

     * prevent person-in-the-middle type of attacks.

     * For example, for Bluetooth 2.1 devices, if any of the devices does not

     * have an input and output capability or just has the ability to

     * display a numeric key, a secure socket connection is not possible.
@@ -1905,7 +1905,7 @@ public final class BluetoothDevice implements Parcelable { 
     * socket will be encrypted.

     * <p> Use this socket only if an authenticated socket link is possible.

     * Authentication refers to the authentication of the link key to

     * prevent man-in-the-middle type of attacks.

     * prevent person-in-the-middle type of attacks.

     * For example, for Bluetooth 2.1 devices, if any of the devices does not

     * have an input and output capability or just has the ability to

     * display a numeric key, a secure socket connection is not possible.
@@ -1937,7 +1937,7 @@ public final class BluetoothDevice implements Parcelable { 
     * Create an RFCOMM {@link BluetoothSocket} socket ready to start an insecure

     * outgoing connection to this remote device using SDP lookup of uuid.

     * <p> The communication channel will not have an authenticated link key

     * i.e it will be subject to man-in-the-middle attacks. For Bluetooth 2.1

     * i.e it will be subject to person-in-the-middle attacks. For Bluetooth 2.1

     * devices, the link key will be encrypted, as encryption is mandatory.

     * For legacy devices (pre Bluetooth 2.1 devices) the link key will

     * be not be encrypted. Use {@link #createRfcommSocketToServiceRecord} if an
@@ -2193,7 +2193,7 @@ public final class BluetoothDevice implements Parcelable { 
     * <p>The remote device will be authenticated and communication on this socket will be

     * encrypted.

     * <p> Use this socket if an authenticated socket link is possible. Authentication refers

     * to the authentication of the link key to prevent man-in-the-middle type of attacks.

     * to the authentication of the link key to prevent person-in-the-middle type of attacks.

     *

     * @param psm dynamic PSM value from remote device

     * @return a CoC #BluetoothSocket ready for an outgoing connection
@@ -2220,7 +2220,7 @@ public final class BluetoothDevice implements Parcelable { 
     * <p>Use {@link BluetoothSocket#connect} to initiate the outgoing connection.

     * <p>Application using this API is responsible for obtaining PSM value from remote device.

     * <p> The communication channel may not have an authenticated link key, i.e. it may be subject

     * to man-in-the-middle attacks. Use {@link #createL2capChannel(int)} if an encrypted and

     * to person-in-the-middle attacks. Use {@link #createL2capChannel(int)} if an encrypted and

     * authenticated communication channel is possible.

     *

     * @param psm dynamic PSM value from remote device

framework/java/android/bluetooth/BluetoothGatt.java

+2 −2
Original line number Diff line number Diff line
@@ -134,14 +134,14 @@ public final class BluetoothGatt implements BluetoothProfile { 
    /*package*/ static final int AUTHENTICATION_NONE = 0;



    /**

     * Authentication requested; no man-in-the-middle protection required.

     * Authentication requested; no person-in-the-middle protection required.

     *

     * @hide

     */

    /*package*/ static final int AUTHENTICATION_NO_MITM = 1;



    /**

     * Authentication with man-in-the-middle protection requested.

     * Authentication with person-in-the-middle protection requested.

     *

     * @hide

     */

framework/java/android/bluetooth/BluetoothGattCallback.java

+1 −1
Original line number Diff line number Diff line
@@ -183,7 +183,7 @@ public abstract class BluetoothGattCallback { 
     * @param gatt GATT client involved

     * @param interval Connection interval used on this connection, 1.25ms unit. Valid range is from

     * 6 (7.5ms) to 3200 (4000ms).

     * @param latency Slave latency for the connection in number of connection events. Valid range

     * @param latency Worker latency for the connection in number of connection events. Valid range

     * is from 0 to 499

     * @param timeout Supervision timeout for this connection, in 10ms unit. Valid range is from 10

     * (0.1s) to 3200 (32s)

framework/java/android/bluetooth/BluetoothGattCharacteristic.java

+3 −3
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ public class BluetoothGattCharacteristic implements Parcelable { 
    public static final int PERMISSION_READ_ENCRYPTED = 0x02;



    /**

     * Characteristic permission: Allow reading with man-in-the-middle protection

     * Characteristic permission: Allow reading with person-in-the-middle protection

     */

    public static final int PERMISSION_READ_ENCRYPTED_MITM = 0x04;
@@ -99,7 +99,7 @@ public class BluetoothGattCharacteristic implements Parcelable { 
    public static final int PERMISSION_WRITE_ENCRYPTED = 0x20;



    /**

     * Characteristic permission: Allow encrypted writes with man-in-the-middle

     * Characteristic permission: Allow encrypted writes with person-in-the-middle

     * protection

     */

    public static final int PERMISSION_WRITE_ENCRYPTED_MITM = 0x40;
@@ -111,7 +111,7 @@ public class BluetoothGattCharacteristic implements Parcelable { 


    /**

     * Characteristic permission: Allow signed write operations with

     * man-in-the-middle protection

     * person-in-the-middle protection

     */

    public static final int PERMISSION_WRITE_SIGNED_MITM = 0x100;