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

Commit 18faf5fd authored by Sonny Sasaka's avatar Sonny Sasaka Committed by Automerger Merge Worker
Browse files

Merge changes I22f6e50f,I24f388db am: 7ae6fc48 am: a9b5253b am: 5b64fd71 

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1741656

Change-Id: I99a021e8daadd7e6ee764e58443405355ea5fdfe
parents f36fb2e8 5b64fd71

system/bta/dm/bta_dm_act.cc

+1 −1
Original line number Diff line number Diff line
@@ -3529,7 +3529,7 @@ static void bta_dm_ble_id_key_cback(uint8_t key_type, 
    case BTM_BLE_KEY_TYPE_ER:

      if (bta_dm_cb.p_sec_cback) {

        tBTA_DM_SEC dm_key = {

            .ble_id_keys{},

            .ble_id_keys = {},

        };

        memcpy(&dm_key.ble_id_keys, p_key, sizeof(tBTM_BLE_LOCAL_KEYS));

system/gd/rust/linux/service/src/iface_bluetooth.rs

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ use crate::dbus_arg::{DBusArg, DBusArgError, RefArgToRust}; 
#[dbus_propmap(BluetoothDevice)]

pub struct BluetoothDeviceDBus {

    address: String,

    name: String,

}



#[allow(dead_code)]

system/gd/rust/linux/stack/src/bluetooth_media.rs

+1 −1
Original line number Diff line number Diff line 
//! Anything related to audio and media API.



use bt_topshim::btif::BluetoothInterface;

use bt_topshim::profiles::a2dp::{A2dp, A2dpCallbacks, A2dpCallbacksDispatcher};

use bt_topshim::profiles::a2dp::{A2dp, A2dpCallbacksDispatcher};

use bt_topshim::topstack;



use std::sync::Arc;

system/osi/src/hash_map_utils.cc

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 


#include "osi/include/hash_map_utils.h"

#include <base/logging.h>  // CHECK()

#include <cstring>

#include <map>

#include <string>

#include "osi/include/allocator.h"