Merge "Update BluetoothDevice#setAlias based on API council feedback: now accepts null input and returns an int (with error codes). Update CompanionDeviceManager#canPairWithoutPrompt to take a UserHandle instead of an int. Adds BluetoothStatusCodes class for all new Bluetooth error / success codes. Moved OOB and hci disconnect constants to the new BluetoothStatusCodes class." into sc-dev

1 files changed, 28 insertions, 149 deletions

diff --git a/framework/java/android/bluetooth/BluetoothAdapter.java b/framework/java/android/bluetooth/BluetoothAdapter.java
index 9fc1f88c01..54941724b2 100644
--- a/framework/java/android/bluetooth/BluetoothAdapter.java
+++ b/framework/java/android/bluetooth/BluetoothAdapter.java
@@ -3258,39 +3258,14 @@ public final class BluetoothAdapter {
 
     /** @hide */
     @Retention(RetentionPolicy.SOURCE)
-    @IntDef(prefix = { "OOB_ERROR_" }, value = {
-        OOB_ERROR_UNKNOWN,
-        OOB_ERROR_ANOTHER_ACTIVE_REQUEST,
-        OOB_ERROR_ADAPTER_DISABLED
+    @IntDef(value = {
+            BluetoothStatusCodes.ERROR_UNKNOWN,
+            BluetoothStatusCodes.ERROR_BLUETOOTH_NOT_ENABLED,
+            BluetoothStatusCodes.ERROR_ANOTHER_ACTIVE_OOB_REQUEST,
     })
     public @interface OobError {}
 
     /**
-     * An unknown error has occurred in the controller, stack, or callback pipeline.
-     *
-     * @hide
-     */
-    @SystemApi
-    public static final int OOB_ERROR_UNKNOWN = 0;
-
-    /**
-     * If another application has already requested {@link OobData} then another fetch will be
-     * disallowed until the callback is removed.
-     *
-     * @hide
-     */
-    @SystemApi
-    public static final int OOB_ERROR_ANOTHER_ACTIVE_REQUEST = 1;
-
-    /**
-     * The adapter is currently disabled, please enable it.
-     *
-     * @hide
-     */
-    @SystemApi
-    public static final int OOB_ERROR_ADAPTER_DISABLED = 2;
-
-    /**
      * Provides callback methods for receiving {@link OobData} from the host stack, as well as an
      * error interface in order to allow the caller to determine next steps based on the {@code
      * ErrorCode}.
@@ -3310,7 +3285,7 @@ public final class BluetoothAdapter {
         /**
          * Provides feedback when things don't go as expected.
          *
-         * @param errorCode - the code descibing the type of error that occurred.
+         * @param errorCode - the code describing the type of error that occurred.
          */
         void onError(@OobError int errorCode);
     }
@@ -3407,7 +3382,7 @@ public final class BluetoothAdapter {
         Preconditions.checkNotNull(callback);
         if (!isEnabled()) {
             Log.w(TAG, "generateLocalOobData(): Adapter isn't enabled!");
-            callback.onError(OOB_ERROR_ADAPTER_DISABLED);
+            callback.onError(BluetoothStatusCodes.ERROR_BLUETOOTH_NOT_ENABLED);
         } else {
             try {
                 mService.generateLocalOobData(transport, new WrappedOobDataCallback(callback,
@@ -4210,141 +4185,45 @@ public final class BluetoothAdapter {
          */
         @Retention(RetentionPolicy.SOURCE)
         @IntDef(prefix = { "REASON_" }, value = {
-                REASON_UNKNOWN,
-                REASON_LOCAL_REQUEST,
-                REASON_REMOTE_REQUEST,
-                REASON_LOCAL_ERROR,
-                REASON_REMOTE_ERROR,
-                REASON_TIMEOUT,
-                REASON_SECURITY,
-                REASON_SYSTEM_POLICY,
-                REASON_RESOURCE_LIMIT_REACHED,
-                REASON_CONNECTION_EXISTS,
-                REASON_BAD_PARAMETERS})
+                BluetoothStatusCodes.ERROR_UNKNOWN,
+                BluetoothStatusCodes.ERROR_DISCONNECT_REASON_LOCAL_REQUEST,
+                BluetoothStatusCodes.ERROR_DISCONNECT_REASON_REMOTE_REQUEST,
+                BluetoothStatusCodes.ERROR_DISCONNECT_REASON_LOCAL,
+                BluetoothStatusCodes.ERROR_DISCONNECT_REASON_REMOTE,
+                BluetoothStatusCodes.ERROR_DISCONNECT_REASON_TIMEOUT,
+                BluetoothStatusCodes.ERROR_DISCONNECT_REASON_SECURITY,
+                BluetoothStatusCodes.ERROR_DISCONNECT_REASON_SYSTEM_POLICY,
+                BluetoothStatusCodes.ERROR_DISCONNECT_REASON_RESOURCE_LIMIT_REACHED,
+                BluetoothStatusCodes.ERROR_DISCONNECT_REASON_CONNECTION_ALREADY_EXISTS,
+                BluetoothStatusCodes.ERROR_DISCONNECT_REASON_BAD_PARAMETERS})
         public @interface DisconnectReason {}
 
         /**
-         * Indicates that the ACL disconnected due to an unknown reason.
-         */
-        public static final int REASON_UNKNOWN = 0;
-
-        /**
-         * Indicates that the ACL disconnected due to an explicit request from the local device.
-         * <p>
-         * Example cause: This is a normal disconnect reason, e.g., user/app initiates
-         * disconnection.
-         */
-        public static final int REASON_LOCAL_REQUEST = 1;
-
-        /**
-         * Indicates that the ACL disconnected due to an explicit request from the remote device.
-         * <p>
-         * Example cause: This is a normal disconnect reason, e.g., user/app initiates
-         * disconnection.
-         * <p>
-         * Example solution: The app can also prompt the user to check their remote device.
-         */
-        public static final int REASON_REMOTE_REQUEST = 2;
-
-        /**
-         * Generic disconnect reason indicating the ACL disconnected due to an error on the local
-         * device.
-         * <p>
-         * Example solution: Prompt the user to check their local device (e.g., phone, car
-         * headunit).
-         */
-        public static final int REASON_LOCAL_ERROR = 3;
-
-        /**
-         * Generic disconnect reason indicating the ACL disconnected due to an error on the remote
-         * device.
-         * <p>
-         * Example solution: Prompt the user to check their remote device (e.g., headset, car
-         * headunit, watch).
-         */
-        public static final int REASON_REMOTE_ERROR = 4;
-
-        /**
-         * Indicates that the ACL disconnected due to a timeout.
-         * <p>
-         * Example cause: remote device might be out of range.
-         * <p>
-         * Example solution: Prompt user to verify their remote device is on or in
-         * connection/pairing mode.
-         */
-        public static final int REASON_TIMEOUT = 5;
-
-        /**
-         * Indicates that the ACL disconnected due to link key issues.
-         * <p>
-         * Example cause: Devices are either unpaired or remote device is refusing our pairing
-         * request.
-         * <p>
-         * Example solution: Prompt user to unpair and pair again.
-         */
-        public static final int REASON_SECURITY = 6;
-
-        /**
-         * Indicates that the ACL disconnected due to the local device's system policy.
-         * <p>
-         * Example cause: privacy policy, power management policy, permissions, etc.
-         * <p>
-         * Example solution: Prompt the user to check settings, or check with their system
-         * administrator (e.g. some corp-managed devices do not allow OPP connection).
-         */
-        public static final int REASON_SYSTEM_POLICY = 7;
-
-        /**
-         * Indicates that the ACL disconnected due to resource constraints, either on the local
-         * device or the remote device.
-         * <p>
-         * Example cause: controller is busy, memory limit reached, maximum number of connections
-         * reached.
-         * <p>
-         * Example solution: The app should wait and try again. If still failing, prompt the user
-         * to disconnect some devices, or toggle Bluetooth on the local and/or the remote device.
-         */
-        public static final int REASON_RESOURCE_LIMIT_REACHED = 8;
-
-        /**
-         * Indicates that the ACL disconnected because another ACL connection already exists.
-         */
-        public static final int REASON_CONNECTION_EXISTS = 9;
-
-        /**
-         * Indicates that the ACL disconnected due to incorrect parameters passed in from the app.
-         * <p>
-         * Example solution: Change parameters and try again. If error persists, the app can report
-         * telemetry and/or log the error in a bugreport.
-         */
-        public static final int REASON_BAD_PARAMETERS = 10;
-
-        /**
          * Returns human-readable strings corresponding to {@link DisconnectReason}.
          */
         public static String disconnectReasonText(@DisconnectReason int reason) {
             switch (reason) {
-                case REASON_UNKNOWN:
+                case BluetoothStatusCodes.ERROR_UNKNOWN:
                     return "Reason unknown";
-                case REASON_LOCAL_REQUEST:
+                case BluetoothStatusCodes.ERROR_DISCONNECT_REASON_LOCAL_REQUEST:
                     return "Local request";
-                case REASON_REMOTE_REQUEST:
+                case BluetoothStatusCodes.ERROR_DISCONNECT_REASON_REMOTE_REQUEST:
                     return "Remote request";
-                case REASON_LOCAL_ERROR:
+                case BluetoothStatusCodes.ERROR_DISCONNECT_REASON_LOCAL:
                     return "Local error";
-                case REASON_REMOTE_ERROR:
+                case BluetoothStatusCodes.ERROR_DISCONNECT_REASON_REMOTE:
                     return "Remote error";
-                case REASON_TIMEOUT:
+                case BluetoothStatusCodes.ERROR_DISCONNECT_REASON_TIMEOUT:
                     return "Timeout";
-                case REASON_SECURITY:
+                case BluetoothStatusCodes.ERROR_DISCONNECT_REASON_SECURITY:
                     return "Security";
-                case REASON_SYSTEM_POLICY:
+                case BluetoothStatusCodes.ERROR_DISCONNECT_REASON_SYSTEM_POLICY:
                     return "System policy";
-                case REASON_RESOURCE_LIMIT_REACHED:
+                case BluetoothStatusCodes.ERROR_DISCONNECT_REASON_RESOURCE_LIMIT_REACHED:
                     return "Resource constrained";
-                case REASON_CONNECTION_EXISTS:
+                case BluetoothStatusCodes.ERROR_DISCONNECT_REASON_CONNECTION_ALREADY_EXISTS:
                     return "Connection already exists";
-                case REASON_BAD_PARAMETERS:
+                case BluetoothStatusCodes.ERROR_DISCONNECT_REASON_BAD_PARAMETERS:
                     return "Bad parameters";
                 default:
                     return "Unrecognized disconnect reason: " + reason;