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

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

Merge "Floss: Handle failed parsing vec from D-Bus" am: df7ffcdc 

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



Change-Id: I3a02d33da07bc4988fed5d8fe700369359f29582
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 36af2c1f df7ffcdc

system/gd/rust/linux/dbus_projection/dbus_macros/src/lib.rs

+4 −1
Original line number Diff line number Diff line
@@ -983,7 +983,10 @@ pub fn generate_dbus_arg(_item: TokenStream) -> TokenStream { 
                _name: String,

            ) -> Result<Self::RustType, Box<dyn Error>> {

                let mut vec: Vec<T> = vec![];

                let mut iter = arg.as_iter().unwrap();

                let mut iter = arg.as_iter().ok_or(Box::new(DBusArgError::new(format!(

                    "Failed parsing array for `{}`",

                    _name

                ))))?;

                let mut val = iter.next();

                while !val.is_none() {

                    let arg = val.unwrap().box_clone();