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

Commit 61d6a321 authored by Pomai Ahlo's avatar Pomai Ahlo Committed by Automerger Merge Worker
Browse files

Merge "Replace SOCKET_CONNECTION_FAILURE w/ correct error" into main am: 23d47c5e am: a8e9c70c 

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



Change-Id: Ie74e4acc1cea0eadacdd5f6e2d79999870a0dcce
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1814ad66 a8e9c70c

framework/api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -1098,6 +1098,7 @@ package android.bluetooth { 
    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 @FlaggedApi("com.android.bluetooth.flags.unix_file_socket_creation_failure") public static final int UNIX_FILE_SOCKET_CREATION_FAILURE = 21; // 0x15

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

  }

framework/java/android/bluetooth/BluetoothSocket.java

+2 −2
Original line number Diff line number Diff line
@@ -482,7 +482,7 @@ public final class BluetoothSocket implements Closeable { 
                            RESULT_L2CAP_CONN_BLUETOOTH_SOCKET_CONNECTION_CLOSED,

                            socketConnectionTimeMillis);

                    throw new BluetoothSocketException(

                            BluetoothSocketException.SOCKET_CONNECTION_FAILURE);

                            BluetoothSocketException.SOCKET_CLOSED);

                }

                if (mPfd == null) {

                    logL2capcocClientConnection(
@@ -490,7 +490,7 @@ public final class BluetoothSocket implements Closeable { 
                            RESULT_L2CAP_CONN_BLUETOOTH_NULL_FILE_DESCRIPTOR,

                            socketConnectionTimeMillis);

                    throw new BluetoothSocketException(

                            BluetoothSocketException.SOCKET_CONNECTION_FAILURE);

                        BluetoothSocketException.UNIX_FILE_SOCKET_CREATION_FAILURE);

                }

                FileDescriptor fd = mPfd.getFileDescriptor();

                mSocket = new LocalSocket(fd);

framework/java/android/bluetooth/BluetoothSocketException.java

+11 −1
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package android.bluetooth; 


import static java.lang.annotation.RetentionPolicy.SOURCE;



import android.annotation.FlaggedApi;

import android.annotation.IntDef;

import android.annotation.NonNull;
@@ -54,7 +55,8 @@ public class BluetoothSocketException extends IOException { 
        SOCKET_CLOSED,

        SOCKET_CONNECTION_FAILURE,

        NULL_DEVICE,

        RPC_FAILURE

        RPC_FAILURE,

        UNIX_FILE_SOCKET_CREATION_FAILURE,

    })

    private @interface ErrorCode {}
@@ -154,6 +156,10 @@ public class BluetoothSocketException extends IOException { 
    /** Error code during connect when a Runtime RPC exception occurs. */

    public static final int RPC_FAILURE = 20;



    /** Error code during connect when the UNIX socket connection creation fails. */

    @FlaggedApi("com.android.bluetooth.flags.unix_file_socket_creation_failure")

    public static final int UNIX_FILE_SOCKET_CREATION_FAILURE = 21;



    /* Corresponding messages for respective error codes. */

    private static final String UNSPECIFIED_MSG = "A Bluetooth Socket failure occurred";

    private static final String L2CAP_UNKNOWN_MSG = "Connection failed for unknown reason";
@@ -179,6 +185,8 @@ public class BluetoothSocketException extends IOException { 
    private static final String SOCKET_CLOSED_MSG = "socket closed";

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

    private static final String NULL_DEVICE_MSG = "Connect is called on null device";

    private static final String UNIX_FILE_SOCKET_CREATION_FAILURE_MSG =

            "Null file descriptor returned";



    @ErrorCode private final int mErrorCode;
@@ -220,6 +228,8 @@ public class BluetoothSocketException extends IOException { 
                return SOCKET_CONNECTION_FAILURE_MSG;

            case NULL_DEVICE:

                return NULL_DEVICE_MSG;

            case UNIX_FILE_SOCKET_CREATION_FAILURE:

                return UNIX_FILE_SOCKET_CREATION_FAILURE_MSG;

            case L2CAP_ACL_FAILURE:

                return L2CAP_ACL_FAILURE_MSG;

            case L2CAP_CLIENT_SECURITY_FAILURE: