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

Commit 0bddcd99 authored by Aritra Sen's avatar Aritra Sen Committed by Automerger Merge Worker
Browse files

Merge changes I92d3dff1,Id3740996 am: bb41b17d am: a7124d67 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2481384



Change-Id: I3f927bba24b9ed2d3738fce60a4979f536d690d8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2479c6fc a7124d67

framework/api/current.txt

+27 −19
Original line number Diff line number Diff line
@@ -1050,30 +1050,38 @@ package android.bluetooth { 
    method public java.io.OutputStream getOutputStream() throws java.io.IOException;

    method public android.bluetooth.BluetoothDevice getRemoteDevice();

    method public boolean isConnected();

    field public static final String BLUETOOTH_OFF_FAILURE_MSG = "Bluetooth is off";

    field public static final String L2CAP_ACL_FAILURE_MSG = "ACL connection failed";

    field public static final String L2CAP_CLIENT_SECURITY_FAILURE_MSG = "Client security clearance failed";

    field public static final String L2CAP_INSUFFICIENT_AUTHENTICATION_MSG = "Insufficient authentication";

    field public static final String L2CAP_INSUFFICIENT_AUTHORIZATION_MSG = "Insufficient authorization";

    field public static final String L2CAP_INSUFFICIENT_ENCRYPTION_MSG = "Insufficient encryption";

    field public static final String L2CAP_INSUFFICIENT_ENCRYPT_KEY_SIZE_MSG = "Insufficient encryption key size";

    field public static final String L2CAP_INVALID_PARAMETERS_MSG = "Invalid Parameters";

    field public static final String L2CAP_INVALID_SOURCE_CID_MSG = "Invalid source CID";

    field public static final String L2CAP_NO_PSM_AVAILABLE_MSG = "No PSM available";

    field public static final String L2CAP_NO_RESOURCES_MSG = "No resources Available";

    field public static final String L2CAP_SOURCE_CID_ALREADY_ALLOCATED_MSG = "Source CID already allocated";

    field public static final String L2CAP_TIMEOUT_MSG = "Connection Timeout";

    field public static final String L2CAP_UNACCEPTABLE_PARAMETERS_MSG = "Unacceptable Parameters";

    field public static final String L2CAP_UNKNOWN_ERR_MSG = "Connection failed for unknown reason";

    field public static final String NULL_DEVICE_ERR_MSG = "Connect is called on null device";

    field public static final String SOCKET_CLOSED_MSG = "socket closed";

    field public static final String SOCKET_CONNECTION_FAILURE_MSG = "bt socket connect failed";

    field public static final String SOCKET_MANAGER_FAILURE_MSG = "bt get socket manager failed";

    field public static final int TYPE_L2CAP = 3; // 0x3

    field public static final int TYPE_RFCOMM = 1; // 0x1

    field public static final int TYPE_SCO = 2; // 0x2

  }



  public class BluetoothSocketException extends java.io.IOException {

    ctor public BluetoothSocketException(int, @NonNull String);

    ctor public BluetoothSocketException(int);

    method public int getErrorCode();

    field public static final int BLUETOOTH_OFF_FAILURE = 15; // 0xf

    field public static final int L2CAP_ACL_FAILURE = 2; // 0x2

    field public static final int L2CAP_CLIENT_SECURITY_FAILURE = 3; // 0x3

    field public static final int L2CAP_INSUFFICIENT_AUTHENTICATION = 4; // 0x4

    field public static final int L2CAP_INSUFFICIENT_AUTHORIZATION = 5; // 0x5

    field public static final int L2CAP_INSUFFICIENT_ENCRYPTION = 7; // 0x7

    field public static final int L2CAP_INSUFFICIENT_ENCRYPT_KEY_SIZE = 6; // 0x6

    field public static final int L2CAP_INVALID_PARAMETERS = 11; // 0xb

    field public static final int L2CAP_INVALID_SOURCE_CID = 8; // 0x8

    field public static final int L2CAP_NO_PSM_AVAILABLE = 13; // 0xd

    field public static final int L2CAP_NO_RESOURCES = 12; // 0xc

    field public static final int L2CAP_SOURCE_CID_ALREADY_ALLOCATED = 9; // 0x9

    field public static final int L2CAP_TIMEOUT = 14; // 0xe

    field public static final int L2CAP_UNACCEPTABLE_PARAMETERS = 10; // 0xa

    field public static final int L2CAP_UNKNOWN = 1; // 0x1

    field public static final int NULL_DEVICE = 19; // 0x13

    field public static final int RPC_FAILURE = 20; // 0x14

    field public static final int SOCKET_CLOSED = 17; // 0x11

    field public static final int SOCKET_CONNECTION_FAILURE = 18; // 0x12

    field public static final int SOCKET_MANAGER_FAILURE = 16; // 0x10

    field public static final int UNSPECIFIED = 0; // 0x0

  }



  public final class BluetoothStatusCodes {

    field public static final int ERROR_BLUETOOTH_NOT_ALLOWED = 2; // 0x2

    field public static final int ERROR_BLUETOOTH_NOT_ENABLED = 1; // 0x1

framework/java/android/bluetooth/BluetoothSocket.java

+26 −216
Original line number Diff line number Diff line
@@ -181,130 +181,6 @@ public final class BluetoothSocket implements Closeable { 
    /** prevents all native calls after destroyNative() */

    private volatile SocketState mSocketState;



    private static final int L2CAP_ACL_FAILURE = 2;

    private static final int L2CAP_CLIENT_SECURITY_FAILURE = 3;

    private static final int L2CAP_INSUFFICIENT_AUTHENTICATION = 4;

    private static final int L2CAP_INSUFFICIENT_AUTHORIZATION = 5;

    private static final int L2CAP_INSUFFICIENT_ENCRYPT_KEY_SIZE = 6;

    private static final int L2CAP_INSUFFICIENT_ENCRYPTION = 7;

    private static final int L2CAP_INVALID_SOURCE_CID = 8;

    private static final int L2CAP_SOURCE_CID_ALREADY_ALLOCATED = 9;

    private static final int L2CAP_UNACCEPTABLE_PARAMETERS = 10;

    private static final int L2CAP_INVALID_PARAMETERS = 11;

    private static final int L2CAP_NO_RESOURCES = 12;

    private static final int L2CAP_NO_PSM_AVAILABLE = 13;

    private static final int L2CAP_TIMEOUT = 14;



    /**

     * IOException message for {@link #connect()} when there is an ACL connection failure.

     */

    public static final String L2CAP_ACL_FAILURE_MSG = "ACL connection failed";



    /**

     * IOException message for {@link #connect()} when security clearance fails on the client during

     * L2CAP connection.

     */

    public static final String L2CAP_CLIENT_SECURITY_FAILURE_MSG =

            "Client security clearance failed";



    /**

     * IOException message for {@link #connect()} when authentication fails on the peer device

     * during L2CAP connection.

     */

    public static final String L2CAP_INSUFFICIENT_AUTHENTICATION_MSG =

            "Insufficient authentication";



    /**

     * IOException message for {@link #connect()} when authorization fails on the peer device during

     * L2CAP connection.

     */

    public static final String L2CAP_INSUFFICIENT_AUTHORIZATION_MSG = "Insufficient authorization";



    /**

     * IOException message for {@link #connect()} indicating insufficient encryption key size on the

     * peer device during L2CAP connection.

     */

    public static final String L2CAP_INSUFFICIENT_ENCRYPT_KEY_SIZE_MSG =

            "Insufficient encryption key size";



    /**

     * IOException message for {@link #connect()} for insufficient encryption from the peer device

     * during L2CAP connection.

     */

    public static final String L2CAP_INSUFFICIENT_ENCRYPTION_MSG = "Insufficient encryption";



    /**

     * IOException message for {@link #connect()} for invalid Channel ID from the peer device during

     * L2CAP connection.

     */

    public static final String L2CAP_INVALID_SOURCE_CID_MSG = "Invalid source CID";



    /**

     * IOException message for {@link #connect()} for already allocated Channel ID from the peer

     * device during L2CAP connection.

     */

    public static final String L2CAP_SOURCE_CID_ALREADY_ALLOCATED_MSG =

            "Source CID already allocated";



    /**

     * IOException message for {@link #connect()} for unacceptable Parameters from the peer device

     * during L2CAP connection.

     */

    public static final String L2CAP_UNACCEPTABLE_PARAMETERS_MSG = "Unacceptable Parameters";



    /**

     * IOException message for {@link #connect()} for invalid parameters from the peer device during

     * L2CAP connection.

     */

    public static final String L2CAP_INVALID_PARAMETERS_MSG = "Invalid Parameters";



    /**

     * IOException message for {@link #connect()} when no resources are available for L2CAP

     * connection.

     */

    public static final String L2CAP_NO_RESOURCES_MSG = "No resources Available";



    /**

     * IOException message for {@link #connect()} when no PSM is available for L2CAP connection.

     */

    public static final String L2CAP_NO_PSM_AVAILABLE_MSG = "No PSM available";



    /**

     * IOException message for {@link #connect()} when L2CAP connection timeout.

     */

    public static final String L2CAP_TIMEOUT_MSG = "Connection Timeout";



    /**

     * IOException message for {@link #connect()} for unknown L2CAP error.

     */

    public static final String L2CAP_UNKNOWN_ERR_MSG = "Connection failed for unknown reason";



    /**

     * IOException message for {@link #connect()} when Bluetooth is off and socket connection is

     * triggered.

     */

    public static final String BLUETOOTH_OFF_FAILURE_MSG = "Bluetooth is off";



    /**

     * IOException message for {@link #connect()} when socket manager is not available.

     */

    public static final String SOCKET_MANAGER_FAILURE_MSG = "bt get socket manager failed";



    /**

     * IOException message for {@link #connect()} when socket is closed.

     */

    public static final String SOCKET_CLOSED_MSG = "socket closed";



    /**

     * IOException message for {@link #connect()} for generic socket connection failures.

     */

    public static final String SOCKET_CONNECTION_FAILURE_MSG = "bt socket connect failed";



    /**

     * IOException message for {@link #connect()} when null device attempts to do socket connection.

     */

    public static final String NULL_DEVICE_ERR_MSG = "Connect is called on null device";



    /** protects mSocketState */

    //private final ReentrantReadWriteLock mLock;
@@ -548,45 +424,20 @@ public final class BluetoothSocket implements Closeable { 
    }

    /**

     * Attempt to connect to a remote device.

     * <p>This method will block until a connection is made or the connection

     * fails. If this method returns without an exception then this socket

     * is now connected.

     * <p>Creating new connections to

     * remote Bluetooth devices should not be attempted while device discovery

     * is in progress. Device discovery is a heavyweight procedure on the

     * Bluetooth adapter and will significantly slow a device connection.

     * Use {@link BluetoothAdapter#cancelDiscovery()} to cancel an ongoing

     * discovery. Discovery is not managed by the Activity,

     * but is run as a system service, so an application should always call

     * {@link BluetoothAdapter#cancelDiscovery()} even if it

     * did not directly request a discovery, just to be sure.

     * <p>This method will block until a connection is made or the connection fails. If this method

     * returns without an exception then this socket is now connected.

     * <p>Creating new connections to remote Bluetooth devices should not be attempted while device

     * discovery is in progress. Device discovery is a heavyweight procedure on the Bluetooth

     * adapter and will significantly slow a device connection. Use

     * {@link BluetoothAdapter#cancelDiscovery()} to cancel an ongoing discovery. Discovery is not

     * managed by the Activity, but is run as a system service, so an application should always call

     * {@link BluetoothAdapter#cancelDiscovery()} even if it did not directly request a discovery,

     * just to be sure.

     * <p>{@link #close} can be used to abort this call from another thread.

     * <p>

     * For failures, an IOException is thrown with a message as follows -

     * <li>{@link NULL_DEVICE_ERR_MSG}: If device is null.

     * <li>{@link SOCKET_CLOSED_MSG} : If socket is already closed.

     * <li>{@link BLUETOOTH_OFF_FAILURE_MSG}: If Bluetooth is turned off.

     * <li>{@link SOCKET_MANAGER_FAILURE_MSG}: If couldn't get socket manager.

     * <li>{@link L2CAP_ACL_FAILURE_MSG}: If ACL connection failure during L2CAP socket connection.

     * <li>{@link L2CAP_CLIENT_SECURITY_FAILURE_MSG}: If L2CAP Client security clearance failure.

     * <li>{@link L2CAP_INSUFFICIENT_AUTHENTICATION_MSG}: If Peer authentication failure during

     * L2CAP connection.

     * <li>{@link L2CAP_INSUFFICIENT_AUTHORIZATION_MSG}: If Peer authorization failure during

     * L2CAP connection.

     * <li>{@link L2CAP_INSUFFICIENT_ENCRYPT_KEY_SIZE_MSG}: If Insufficient encryption key size.

     * <li>{@link L2CAP_INSUFFICIENT_ENCRYPTION_MSG}: If Insufficient encryption for L2CAP

     * connection.

     * <li>{@link L2CAP_INVALID_SOURCE_CID_MSG}: If Source CID is invalid.

     * <li>{@link L2CAP_SOURCE_CID_ALREADY_ALLOCATED_MSG}: If Source CID is already allocated.

     * <li>{@link L2CAP_UNACCEPTABLE_PARAMETERS_MSG}: If Unacceptable parameters for L2CAP socket.

     * <li>{@link L2CAP_INVALID_PARAMETERS_MSG}: If Invalid parameters for L2CAP socket.

     * <li>{@link L2CAP_NO_RESOURCES_MSG}: If No resources available for L2CAP connection.

     * <li>{@link L2CAP_NO_PSM_AVAILABLE_MSG}: If No PSM available for L2CAP connection

     * <li>{@link L2CAP_TIMEOUT_MSG}: If L2CAP connection timeout.

     * <li>{@link SOCKET_CONNECTION_FAILURE_MSG}: If a generic socket connection excluding one above

     * occurs.

     *

     * @throws IOException on error.

     * @throws BluetoothSocketException in case of failure, with the corresponding

     * {@link BluetoothSocketException#ErrorCode}.

     * @throws IOException for other errors (eg: InputStream read failures etc.).

     */

    @RequiresBluetoothConnectPermission

    @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT)
@@ -594,25 +445,25 @@ public final class BluetoothSocket implements Closeable { 
        IBluetooth bluetoothProxy =

                BluetoothAdapter.getDefaultAdapter().getBluetoothService();

        if (bluetoothProxy == null) {

            throw new IOException(BLUETOOTH_OFF_FAILURE_MSG);

            throw new BluetoothSocketException(BluetoothSocketException.BLUETOOTH_OFF_FAILURE);

        }

        if (mDevice == null) {

            logL2capcocClientConnection(

                    bluetoothProxy, RESULT_L2CAP_CONN_BLUETOOTH_NULL_BLUETOOTH_DEVICE);

            throw new IOException(NULL_DEVICE_ERR_MSG);

            throw new BluetoothSocketException(BluetoothSocketException.NULL_DEVICE);

        }

        try {

            if (mSocketState == SocketState.CLOSED) {

                logL2capcocClientConnection(

                        bluetoothProxy, RESULT_L2CAP_CONN_BLUETOOTH_SOCKET_CONNECTION_CLOSED);

                throw new IOException(SOCKET_CLOSED_MSG);

                throw new BluetoothSocketException(BluetoothSocketException.SOCKET_CLOSED);

            }



            IBluetoothSocketManager socketManager = bluetoothProxy.getSocketManager();

            if (socketManager == null) {

                logL2capcocClientConnection(

                        bluetoothProxy, RESULT_L2CAP_CONN_BLUETOOTH_GET_SOCKET_MANAGER_FAILED);

                throw new IOException(SOCKET_MANAGER_FAILURE_MSG);

                throw new BluetoothSocketException(BluetoothSocketException.SOCKET_MANAGER_FAILURE);

            }

            mPfd = socketManager.connectSocket(mDevice, mType, mUuid, mPort, getSecurityFlags());

            synchronized (this) {
@@ -620,12 +471,14 @@ public final class BluetoothSocket implements Closeable { 
                if (mSocketState == SocketState.CLOSED) {

                    logL2capcocClientConnection(

                            bluetoothProxy, RESULT_L2CAP_CONN_BLUETOOTH_SOCKET_CONNECTION_CLOSED);

                    throw new IOException(SOCKET_CLOSED_MSG);

                    throw new BluetoothSocketException(

                            BluetoothSocketException.SOCKET_CONNECTION_FAILURE);

                }

                if (mPfd == null) {

                    logL2capcocClientConnection(

                            bluetoothProxy, RESULT_L2CAP_CONN_BLUETOOTH_NULL_FILE_DESCRIPTOR);

                    throw new IOException(SOCKET_CONNECTION_FAILURE_MSG);

                    throw new BluetoothSocketException(

                            BluetoothSocketException.SOCKET_CONNECTION_FAILURE);

                }

                FileDescriptor fd = mPfd.getFileDescriptor();

                mSocket = new LocalSocket(fd);
@@ -635,58 +488,14 @@ public final class BluetoothSocket implements Closeable { 
            int channel = readInt(mSocketIS);

            if (channel == 0) {

                int errCode = (int) mSocketIS.read();

                String exceptionMsg = "";

                switch(errCode) {

                    case L2CAP_ACL_FAILURE:

                        exceptionMsg = L2CAP_ACL_FAILURE_MSG;

                        break;

                    case L2CAP_CLIENT_SECURITY_FAILURE:

                        exceptionMsg = L2CAP_CLIENT_SECURITY_FAILURE_MSG;

                        break;

                    case L2CAP_INSUFFICIENT_AUTHENTICATION:

                        exceptionMsg = L2CAP_INSUFFICIENT_AUTHORIZATION_MSG;

                        break;

                    case L2CAP_INSUFFICIENT_AUTHORIZATION:

                        exceptionMsg = L2CAP_INSUFFICIENT_AUTHORIZATION_MSG;

                        break;

                    case L2CAP_INSUFFICIENT_ENCRYPT_KEY_SIZE:

                        exceptionMsg = L2CAP_INSUFFICIENT_ENCRYPT_KEY_SIZE_MSG;

                        break;

                    case L2CAP_INSUFFICIENT_ENCRYPTION:

                        exceptionMsg = L2CAP_INSUFFICIENT_ENCRYPTION_MSG;

                        break;

                    case L2CAP_INVALID_SOURCE_CID:

                        exceptionMsg = L2CAP_INVALID_SOURCE_CID_MSG;

                        break;

                    case L2CAP_SOURCE_CID_ALREADY_ALLOCATED:

                        exceptionMsg = L2CAP_SOURCE_CID_ALREADY_ALLOCATED_MSG;

                        break;

                    case L2CAP_UNACCEPTABLE_PARAMETERS:

                        exceptionMsg = L2CAP_UNACCEPTABLE_PARAMETERS_MSG;

                        break;

                    case L2CAP_INVALID_PARAMETERS:

                        exceptionMsg = L2CAP_INVALID_PARAMETERS_MSG;

                        break;

                    case L2CAP_NO_RESOURCES:

                        exceptionMsg = L2CAP_NO_RESOURCES_MSG;

                        break;

                    case L2CAP_NO_PSM_AVAILABLE:

                        exceptionMsg = L2CAP_NO_PSM_AVAILABLE_MSG;

                        break;

                    case L2CAP_TIMEOUT:

                        exceptionMsg = L2CAP_TIMEOUT_MSG;

                        break;

                    default:

                        exceptionMsg = L2CAP_UNKNOWN_ERR_MSG;

                        errCode = RESULT_L2CAP_CONN_UNKNOWN;

                }

                logL2capcocClientConnection(bluetoothProxy, errCode);

                throw new IOException(exceptionMsg);

                throw new BluetoothSocketException(errCode);

            }

            if (channel < 0) {

                logL2capcocClientConnection(

                        bluetoothProxy, RESULT_L2CAP_CONN_BLUETOOTH_SOCKET_CONNECTION_FAILED);

                throw new IOException(SOCKET_CONNECTION_FAILURE_MSG);

                throw new BluetoothSocketException(

                        BluetoothSocketException.SOCKET_CONNECTION_FAILURE);

            }

            mPort = channel;

            waitSocketSignal(mSocketIS);
@@ -694,7 +503,7 @@ public final class BluetoothSocket implements Closeable { 
                if (mSocketState == SocketState.CLOSED) {

                    logL2capcocClientConnection(

                            bluetoothProxy, RESULT_L2CAP_CONN_BLUETOOTH_SOCKET_CONNECTION_CLOSED);

                    throw new IOException(SOCKET_CLOSED_MSG);

                    throw new BluetoothSocketException(BluetoothSocketException.SOCKET_CLOSED);

                }

                mSocketState = SocketState.CONNECTED;

                if (DBG) Log.d(TAG, "connect(), socket connected");
@@ -704,7 +513,8 @@ public final class BluetoothSocket implements Closeable { 
            Log.e(TAG, e.toString() + "\n" + Log.getStackTraceString(new Throwable()));

            logL2capcocClientConnection(

                    bluetoothProxy, RESULT_L2CAP_CONN_BLUETOOTH_UNABLE_TO_SEND_RPC);

            throw new IOException("unable to send RPC: " + e.getMessage());

            throw new BluetoothSocketException(BluetoothSocketException.RPC_FAILURE,

                    "unable to send RPC: " + e.getMessage());

        }

    }

framework/java/android/bluetooth/BluetoothSocketException.java

0 → 100644
+279 −0

File added.

Preview size limit exceeded, changes collapsed.