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

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

Merge "Remove Sockets 24Q3 flag" into main am: f3442f18 

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



Change-Id: Ib6e77729a3c1bd44aceffe3a8c3c610ff76aab3b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8081a350 f3442f18

framework/api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -1132,7 +1132,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 UNIX_FILE_SOCKET_CREATION_FAILURE = 21; // 0x15

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

  }

framework/java/android/bluetooth/BluetoothSocketException.java

+0 −4
Original line number Diff line number Diff line
@@ -18,13 +18,10 @@ package android.bluetooth; 


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



import android.annotation.FlaggedApi;

import android.annotation.IntDef;

import android.annotation.NonNull;

import android.annotation.RequiresNoPermission;



import com.android.bluetooth.flags.Flags;



import java.io.IOException;

import java.lang.annotation.Retention;
@@ -169,7 +166,6 @@ public class BluetoothSocketException extends IOException { 
    public static final int RPC_FAILURE = 20;



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

    @FlaggedApi(Flags.FLAG_UNIX_FILE_SOCKET_CREATION_FAILURE)

    public static final int UNIX_FILE_SOCKET_CREATION_FAILURE = 21;



    /* Corresponding messages for respective error codes. */