Merge "Add IntDef for the return value of BluetoothAdapter#notifyActiveDeviceChangeApplied" (d63ef1ec) · Commits · e / os / android_packages_modules_Bluetooth

framework/java/android/bluetooth/BluetoothAdapter.java

+13 −0

Original line number	Diff line number	Diff line
		@@ -5217,6 +5217,18 @@ public final class BluetoothAdapter {
		return defaultValue;
		}

		/** @hide */
		@Retention(RetentionPolicy.SOURCE)
		@IntDef(value = {
		BluetoothStatusCodes.SUCCESS,
		BluetoothStatusCodes.ERROR_BLUETOOTH_NOT_ENABLED,
		BluetoothStatusCodes.ERROR_BLUETOOTH_NOT_ALLOWED,
		BluetoothStatusCodes.ERROR_DEVICE_NOT_BONDED,
		BluetoothStatusCodes.ERROR_MISSING_BLUETOOTH_CONNECT_PERMISSION,
		BluetoothStatusCodes.ERROR_UNKNOWN
		})
		public @interface NotifyActiveDeviceChangeAppliedReturnValues {}

		/**
		* Called by audio framework to inform the Bluetooth stack that an active device change has
		* taken effect. If this active device change is triggered by an app calling
		@@ -5239,6 +5251,7 @@ public final class BluetoothAdapter {
		android.Manifest.permission.BLUETOOTH_CONNECT,
		android.Manifest.permission.BLUETOOTH_PRIVILEGED,
		})
		@NotifyActiveDeviceChangeAppliedReturnValues
		public int notifyActiveDeviceChangeApplied(@NonNull BluetoothDevice device) {
		if (DBG) Log.d(TAG, "notifyActiveDeviceChangeApplied(" + device + ")");
		Objects.requireNonNull(device, "device cannot be null");