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

Commit 2920d8e9 authored by Myles Watson's avatar Myles Watson Committed by android-build-merger
Browse files

Merge "RootCanal: Initialize connecting states to false" am: bb4bd5b4 

am: 74edf451

Change-Id: Idc31d86dce9202bfd5de4189f99a31aa60b0e87b
parents ac8abacd 74edf451

system/vendor_libs/test_vendor_lib/model/controller/acl_connection_handler.h

+2 −2
Original line number Diff line number Diff line
@@ -62,9 +62,9 @@ class AclConnectionHandler { 


 private:

  std::unordered_map<uint16_t, AclConnection> acl_connections_;

  bool classic_connection_pending_;

  bool classic_connection_pending_{false};

  Address pending_connection_address_;

  bool le_connection_pending_;

  bool le_connection_pending_{false};

  Address pending_le_connection_address_;

  uint8_t pending_le_connection_address_type_;

  uint16_t GetUnusedHandle();

system/vendor_libs/test_vendor_lib/model/controller/link_layer_controller.h

+1 −1
Original line number Diff line number Diff line
@@ -260,7 +260,7 @@ class LinkLayerController { 
  uint8_t le_scan_filter_duplicates_;

  uint8_t le_address_type_;



  bool le_connect_;

  bool le_connect_{false};

  uint16_t le_connection_interval_min_;

  uint16_t le_connection_interval_max_;

  uint16_t le_connection_latency_;