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

Commit a83a3b63 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Bluetooth: fix -Wdefaulted-function-deleted warnings." am: 671dffc7... 

Merge "Bluetooth: fix -Wdefaulted-function-deleted warnings." am: 671dffc7 am: 0ae26d14 am: 1b7463db am: ee6ef5b0 am: 188cc77e

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



Change-Id: I35e84160e0a7d0717856d734a4a2c30db6210d1b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e17a32fc 188cc77e

system/osi/src/hash_map_utils.cc

+0 −3
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ hash_map_utils_new_from_string_params(const char* params) { 
  if (!str) return map;



  // Parse |str| and add extracted key-and-value pair(s) in |map|.

  int items = 0;

  char* tmpstr;

  char* kvpair = strtok_r(str, ";", &tmpstr);

  while (kvpair && *kvpair) {
@@ -60,8 +59,6 @@ hash_map_utils_new_from_string_params(const char* params) { 


    osi_free(key);

    osi_free(value);



    items++;

  next_pair:

    kvpair = strtok_r(NULL, ";", &tmpstr);

  }

system/service/ipc/binder/ipc_handler_binder.h

+0 −2
Original line number Diff line number Diff line
@@ -36,8 +36,6 @@ class IPCHandlerBinder : public IPCHandler { 
  void Stop() override;



 private:

  IPCHandlerBinder() = default;



  // Notify the delegate that IPC has started.

  void NotifyStarted();

};

system/service/ipc/ipc_handler_linux.h

+0 −2
Original line number Diff line number Diff line
@@ -45,8 +45,6 @@ class IPCHandlerLinux : public IPCHandler { 
  void Stop() override;



 private:

  IPCHandlerLinux() = default;



  // Starts listening for incoming connections. Posted on |thread_| by Run().

  void StartListeningOnThread();