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

Commit 578ad962 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 5450365 from ef1e0371 to pi-platform-release 

Change-Id: I93c7dd9dc1084fbe5f2f3cd8075b92fd05013d7e
parents 895f2cf1 ef1e0371

system/bta/sys/utl.cc

+2 −1
Original line number Diff line number Diff line
@@ -242,7 +242,8 @@ bool utl_isintstr(const char* p_s) { 
 ******************************************************************************/

bool utl_isdialchar(const char d) {

  return (((d >= '0') && (d <= '9')) || (d == '*') || (d == '+') ||

          (d == '#') || (d == ';') || ((d >= 'A') && (d <= 'C')) ||

          (d == '#') || (d == ';') || (d == ',') ||

          ((d >= 'A') && (d <= 'C')) ||

          ((d == 'p') || (d == 'P') || (d == 'w') || (d == 'W')));

}

system/btif/avrcp/avrcp_service.cc

+10 −9
Original line number Diff line number Diff line
@@ -346,9 +346,10 @@ void AvrcpService::SendMediaUpdate(bool track_changed, bool play_state, 


  // This function may be called on any thread, we need to make sure that the

  // device update happens on the main thread.

  for (auto device : instance_->connection_handler_->GetListOfDevices()) {

    do_in_bta_thread(FROM_HERE, base::Bind(&Device::SendMediaUpdate,

                                           base::Unretained(device.get()),

  for (const auto& device :

       instance_->connection_handler_->GetListOfDevices()) {

    do_in_bta_thread(FROM_HERE,

                     base::Bind(&Device::SendMediaUpdate, device.get()->Get(),

                                track_changed, play_state, queue));

  }

}
@@ -361,10 +362,10 @@ void AvrcpService::SendFolderUpdate(bool available_players, 
            << " uids=" << uids;



  // Ensure that the update is posted to the correct thread

  for (auto device : instance_->connection_handler_->GetListOfDevices()) {

    do_in_bta_thread(

        FROM_HERE,

        base::Bind(&Device::SendFolderUpdate, base::Unretained(device.get()),

  for (const auto& device :

       instance_->connection_handler_->GetListOfDevices()) {

    do_in_bta_thread(FROM_HERE,

                     base::Bind(&Device::SendFolderUpdate, device.get()->Get(),

                                available_players, addressed_players, uids));

  }

}

system/btif/src/bluetooth.cc

+0 −2
Original line number Diff line number Diff line
@@ -326,8 +326,6 @@ static void dump(int fd, const char** arguments) { 
#if (BTSNOOP_MEM == TRUE)

  btif_debug_btsnoop_dump(fd);

#endif



  close(fd);

}



static void dumpMetrics(std::string* output) {

system/btif/src/btif_storage.cc

+4 −2
Original line number Diff line number Diff line
@@ -207,10 +207,12 @@ static int prop2cfg(const RawAddress* remote_bd_addr, bt_property_t* prop) { 
                            : prop->len;

      strncpy(value, (char*)prop->val, name_length);

      value[name_length] = '\0';

      if (remote_bd_addr)

      if (remote_bd_addr) {

        btif_config_set_str(bdstr, BTIF_STORAGE_PATH_REMOTE_NAME, value);

      else

      } else {

        btif_config_set_str("Adapter", BTIF_STORAGE_KEY_ADAPTER_NAME, value);

        btif_config_flush();

      }

      break;

    }

    case BT_PROPERTY_REMOTE_FRIENDLY_NAME:

system/profile/avrcp/device.cc

+2 −0
Original line number Diff line number Diff line
@@ -52,6 +52,8 @@ void Device::RegisterInterfaces(MediaInterface* media_interface, 
  volume_interface_ = volume_interface;

}



base::WeakPtr<Device> Device::Get() { return weak_ptr_factory_.GetWeakPtr(); }



bool Device::IsActive() const {

  return address_ == a2dp_interface_->active_peer();

}