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

Commit d6a8aa18 authored by Ying Hsu's avatar Ying Hsu Committed by Automerger Merge Worker
Browse files

Merge "Floss: updating enum BtDeviceType and changing its default value" am:... 

Merge "Floss: updating enum BtDeviceType and changing its default value" am: d804664a am: 30e22554 am: c068dacb am: ec54c3ef am: 31d78c7e

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



Change-Id: Id57b24771ef06cf0beb282bda4fa3ddfb0651147
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 551098bb 31d78c7e

system/gd/rust/topshim/src/btif.rs

+3 −3
Original line number Diff line number Diff line
@@ -118,10 +118,10 @@ impl From<bindings::bt_acl_state_t> for BtAclState { 
#[derive(Clone, Debug, FromPrimitive, ToPrimitive, PartialEq, PartialOrd)]

#[repr(u32)]

pub enum BtDeviceType {

    Bredr = 0x1,

    Unknown = 0,

    Bredr,

    Ble,

    Dual,

    Unknown,

}



#[derive(Clone, Debug, Eq, Hash, FromPrimitive, ToPrimitive, PartialEq, PartialOrd)]
@@ -487,7 +487,7 @@ impl From<bindings::bt_property_t> for BluetoothProperty { 
                BluetoothProperty::ClassOfDevice(u32_from_bytes(slice))

            }

            BtPropertyType::TypeOfDevice => BluetoothProperty::TypeOfDevice(

                BtDeviceType::from_u32(u32_from_bytes(slice)).unwrap_or(BtDeviceType::Bredr),

                BtDeviceType::from_u32(u32_from_bytes(slice)).unwrap_or(BtDeviceType::Unknown),

            ),

            BtPropertyType::ServiceRecord => {

                let v = unsafe { *(prop.val as *const bindings::bt_service_record_t) };