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

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

Merge "floss: Align the SetVolume signature" am: 3d108316 am: c8a85a61 am:... 

Merge "floss: Align the SetVolume signature" am: 3d108316 am: c8a85a61 am: 7be0c5d4 am: 13152d23

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



Change-Id: I5f7f390fd2180425277dca75a153a3a6e31faf43
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 391f7848 13152d23

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

+1 −1
Original line number Diff line number Diff line
@@ -126,7 +126,7 @@ impl IBluetoothMedia for IBluetoothMediaDBus { 
    }



    #[dbus_method("SetVolume")]

    fn set_volume(&mut self, volume: i32) {

    fn set_volume(&mut self, volume: u8) {

        dbus_generated!()

    }

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

+8 −4
Original line number Diff line number Diff line
@@ -48,7 +48,10 @@ pub trait IBluetoothMedia { 
        bits_per_sample: i32,

        channel_mode: i32,

    ) -> bool;

    fn set_volume(&mut self, volume: i32);



    // Set the A2DP/AVRCP volume. Valid volume specified by the spec should be

    // in the range of 0-127.

    fn set_volume(&mut self, volume: u8);



    // Set the HFP speaker volume. Valid volume specified by the HFP spec should

    // be in the range of 0-15.
@@ -541,11 +544,12 @@ impl IBluetoothMedia for BluetoothMedia { 
        true

    }



    fn set_volume(&mut self, volume: i32) {

    fn set_volume(&mut self, volume: u8) {

        // Guard the range 0-127 by the try_from cast from u8 to i8.

        match i8::try_from(volume) {

            Ok(val) => self.avrcp.as_mut().unwrap().set_volume(val),

            _ => (),

        };

            _ => warn!("Ignore invalid volume {}", volume),

        }

    }



    fn set_hfp_volume(&mut self, volume: u8, address: String) {