Merge branch 'master' into release

Change-Id: I1301beacba87281b5818eb5e3f54525919158918
2026-09-16 15:36:12 -04:00 · 2020-08-25 11:34:15 -07:00
parent 65ded1d0e0 2994e4f134
commit 01e22ef713
110 changed files with 4758 additions and 1245 deletions
@@ -118,7 +118,8 @@ class Core {
  //         issue with Bluetooth/WiFi.
  //     Status::STATUS_ERROR if we failed to connect for any other reason.
  void RequestConnection(absl::string_view endpoint_id,
-                         ConnectionRequestInfo info, ResultCallback callback);
+                         ConnectionRequestInfo info, ConnectionOptions options,
+                         ResultCallback callback);

  // Accepts a connection to a remote endpoint. This method must be called
  // before Payloads can be exchanged with the remote endpoint.