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

Commit 826bcb89 authored by Sonny Sasaka's avatar Sonny Sasaka Committed by Automerger Merge Worker
Browse files

Merge changes Ifed5d215,Ia68f6be3 am: 7a30c68e am: b283f977 am: 8d22573e 

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



Change-Id: Ib1fbc48aaced90ae07fb7090bce110a8e6a74b6b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents dc0436ff 8d22573e

system/gd/rust/linux/client/src/dbus_iface.rs

+1 −1
Original line number Diff line number Diff line
@@ -1447,7 +1447,7 @@ impl ISuspend for SuspendDBus { 
    }



    #[dbus_method("Suspend")]

    fn suspend(&self, _suspend_type: SuspendType) {

    fn suspend(&mut self, _suspend_type: SuspendType) {

        dbus_generated!()

    }

system/gd/rust/linux/mgmt/src/dbus_iface.rs

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ impl ISuspend for SuspendDBus { 
    }



    #[dbus_method("Suspend")]

    fn suspend(&self, _suspend_type: SuspendType) {

    fn suspend(&mut self, _suspend_type: SuspendType) {

        dbus_generated!()

    }

system/gd/rust/linux/mgmt/src/powerd_suspend_manager.rs

+2 −2
Original line number Diff line number Diff line
@@ -441,8 +441,8 @@ impl PowerdSuspendManager { 
        {

            // Anonymous block to contain locked `self.context` which needs to be called multiple

            // times in the `if let` block below. Prevent deadlock by locking only once.

            let context_locked = self.context.lock().unwrap();

            if let Some(adapter_suspend_dbus) = &context_locked.adapter_suspend_dbus {

            let mut context_locked = self.context.lock().unwrap();

            if let Some(adapter_suspend_dbus) = &mut context_locked.adapter_suspend_dbus {

                adapter_suspend_dbus.suspend(match suspend_imminent.get_reason() {

                    SuspendImminent_Reason::IDLE => SuspendType::AllowWakeFromHid,

                    SuspendImminent_Reason::LID_CLOSED => SuspendType::NoWakesAllowed,

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

+1 −1
Original line number Diff line number Diff line
@@ -564,7 +564,7 @@ impl ISuspend for ISuspendDBus { 
    }



    #[dbus_method("Suspend")]

    fn suspend(&self, suspend_type: SuspendType) {

    fn suspend(&mut self, suspend_type: SuspendType) {

        dbus_generated!()

    }

system/gd/rust/linux/stack/btif_macros/src/lib.rs

+44 −15
Original line number Diff line number Diff line
@@ -42,23 +42,53 @@ pub fn btif_callback(_attr: TokenStream, item: TokenStream) -> TokenStream { 
}



/// Generates a dispatcher from a message to a function.

///

/// Example usage: This will generate a function called `dispatch_base_callbacks` to dispatch

/// `bt_topshim::btif::BaseCallbacks` to the functions in the defined trait.

///

/// ```ignore

/// #[btif_callbacks_dispatcher(dispatch_base_callbacks, BaseCallbacks)]

/// trait BtifBluetoothCallbacks {

///     #[btif_callback(Foo)]

///     fn foo(&mut self, param1: u32, param2: bool);

///     #[btif_callback(Bar)]

///     fn bar(&mut self);

/// }

/// ```

///

/// Structs can implement the callback trait like:

/// ```ignore

/// struct Struct1 {}

/// impl BtifBluetoothCallbacks for Struct1 {

///     fn foo(&mut self, param1: u32, param2: bool) {...}

///     fn bar(&mut self) {...}

/// }

///

/// struct Struct2 {}

/// impl BtifBluetoothCallbacks for Struct2 {

///     fn foo(&mut self, param1: u32, param2: bool) {...}

///     fn bar(&mut self) {...}

/// }

/// ```

///

/// The generated function can be called against any struct that implements the defined trait:

/// ```ignore

/// let struct1 = Struct1 {};

/// let struct2 = Struct2 {};

/// dispatch_base_callbacks(&mut struct1, BaseCallbacks::Foo(1, true));

/// dispatch_base_callbacks(&mut struct2, BaseCallbacks::Foo(2, false));

/// ```

#[proc_macro_attribute]

pub fn btif_callbacks_dispatcher(attr: TokenStream, item: TokenStream) -> TokenStream {

    let args = Punctuated::<Expr, Comma>::parse_separated_nonempty.parse(attr.clone()).unwrap();



    let struct_ident = if let Expr::Path(p) = &args[0] {

        p.path.get_ident().unwrap()

    } else {

        panic!("struct name must be specified");

    };



    let fn_ident = if let Expr::Path(p) = &args[1] {

    let fn_ident = if let Expr::Path(p) = &args[0] {

        p.path.get_ident().unwrap()

    } else {

        panic!("function name must be specified");

    };



    let callbacks_struct_ident = if let Expr::Path(p) = &args[2] {

    let callbacks_struct_ident = if let Expr::Path(p) = &args[1] {

        p.path.get_ident().unwrap()

    } else {

        panic!("callbacks struct ident must be specified");
@@ -67,6 +97,7 @@ pub fn btif_callbacks_dispatcher(attr: TokenStream, item: TokenStream) -> TokenS 
    let mut dispatch_arms = quote! {};



    let ast: ItemTrait = syn::parse(item.clone()).unwrap();

    let trait_ident = ast.ident;



    let mut fn_names = quote! {};

    for attr in ast.items {
@@ -110,7 +141,7 @@ pub fn btif_callbacks_dispatcher(attr: TokenStream, item: TokenStream) -> TokenS 
            dispatch_arms = quote! {

                #dispatch_arms

                #callbacks_struct_ident::#btif_callback(#arg_names) => {

                    self.#method_ident(#arg_names);

                    obj.#method_ident(#arg_names);

                }

            };

        }
@@ -120,15 +151,13 @@ pub fn btif_callbacks_dispatcher(attr: TokenStream, item: TokenStream) -> TokenS 


    let gen = quote! {

        #ori_item

        impl #struct_ident {

            pub(crate) fn #fn_ident(&mut self, cb: #callbacks_struct_ident) {

        pub(crate) fn #fn_ident<T: #trait_ident>(obj: &mut T, cb: #callbacks_struct_ident) {

            match cb {

                #dispatch_arms



                _ => println!("Unhandled callback arm {:?}", cb),

            }

        }

        }

    };



    // TODO: Have a simple framework to turn on/off macro-generated code debug.