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

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

Merge changes I8112a2c4,I3d356feb am: f40a2c37 

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

Change-Id: I23d4313f1c1b09829423337fc8a0ee7784354bfc
parents 246174eb f40a2c37

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

+3 −1
Original line number Diff line number Diff line
@@ -1413,7 +1413,9 @@ mod tests { 
    }



    impl RPCProxy for TestBluetoothGattCallback {

        fn register_disconnect(&mut self, _id: u32, _f: Box<dyn Fn(u32) + Send>) {}

        fn register_disconnect(&mut self, _f: Box<dyn Fn(u32) + Send>) -> u32 {

            0

        }



        fn get_object_id(&self) -> String {

            self.id.clone()

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

+3 −0
Original line number Diff line number Diff line 
#![allow(non_upper_case_globals)]

#![allow(non_camel_case_types)]

#![allow(non_snake_case)]

// TODO(b/203002625) - since rustc 1.53, bindgen causes UB warnings

// Remove this once bindgen figures out how to do this correctly

#![allow(deref_nullptr)]



include!(concat!(env!("OUT_DIR"), "/bindings.rs"));