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

Commit 963a78b8 authored by Henri Chataing's avatar Henri Chataing Committed by Automerger Merge Worker
Browse files

Merge changes I422445af,I9c995127 into main am: 8954a83c 

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3004551



Change-Id: Icb032396f7a49c38093eed869342c0fd249c1221
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4b469e5e 8954a83c

uwb/aidl/default/src/uwb_chip.rs

+8 −4
Original line number Diff line number Diff line
@@ -241,6 +241,7 @@ impl IUwbChipAsyncServer for UwbChip { 
                // Read the payload bytes.

                read_exact(reader.get_mut(), &mut buffer[UWB_HEADER_SIZE..]).unwrap();



                log::debug!(" <-- {:?}", buffer);

                client_callbacks.onUciMessage(&buffer).unwrap();

            }

        });
@@ -295,10 +296,13 @@ impl IUwbChipAsyncServer for UwbChip { 
        log::debug!("sendUciMessage");



        if let State::Opened { ref mut serial, .. } = &mut *self.state.lock().await {

            serial

                .write(data)

                .map(|written| written as i32)

                .map_err(|_| binder::StatusCode::UNKNOWN_ERROR.into())

            log::debug!(" --> {:?}", data);

            let result = serial

                .write_all(data)

                .map(|_| data.len() as i32)

                .map_err(|_| binder::StatusCode::UNKNOWN_ERROR.into());

            log::debug!(" status: {:?}", result);

            result

        } else {

            Err(binder::ExceptionCode::ILLEGAL_STATE.into())

        }