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

Commit 82118201 authored by Katherine Lai's avatar Katherine Lai Committed by Automerger Merge Worker
Browse files

Merge changes I30ea8bec,Ic3670c91 am: 84cefb69 am: 19742cb1 am: be8c976f 

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



Change-Id: I1626ef6a635a41762b91785407ff506f825b2c24
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 29ee860f be8c976f

system/gd/os/linux/system_properties.cc

+2 −0
Original line number Diff line number Diff line
@@ -29,6 +29,8 @@ std::mutex properties_mutex; 
// Properties set along with some default values for Floss.

std::unordered_map<std::string, std::string> properties = {

    {"bluetooth.profile.avrcp.target.enabled", "true"},

    // TODO (b/235218533): Re-enable LL privacy on Floss

    {"bluetooth.core.gap.le.privacy.enabled", "false"},

};

}  // namespace

system/gd/rust/linux/mgmt/Cargo.toml

+3 −0
Original line number Diff line number Diff line
@@ -12,7 +12,9 @@ bt_socket = { path = "../socket" } 
btstack = { path = "../stack" }



# external deps

base64 = "0.13.0"

clap = "2.33.3"

configparser = "3.0.0"

dbus = "0.9.2"

dbus-tokio = "0.7.3"

dbus-crossroads = "0.4.0"
@@ -20,6 +22,7 @@ dbus_projection = { path = "../dbus_projection" } 
dbus_macros = { path = "../dbus_projection/dbus_macros" }

env_logger = "0.8.3"

futures = "0.3.13"

glob = "0.3.0"

inotify = "*"

log = "0.4.14"

nix = "*"

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

+3 −1
Original line number Diff line number Diff line
@@ -3,11 +3,11 @@ use log::{error, info, warn}; 
use std::collections::HashMap;

use std::process::Command;



use crate::config_util;

use crate::iface_bluetooth_manager::{

    AdapterWithEnabled, IBluetoothManager, IBluetoothManagerCallback,

};

use crate::state_machine::{state_to_enabled, AdapterState, Message, StateMachineProxy};

use crate::{config_util, migrate};



const BLUEZ_INIT_TARGET: &str = "bluetoothd";
@@ -119,6 +119,7 @@ impl IBluetoothManager for BluetoothManager { 
            if let Err(e) = Command::new("initctl").args(&["stop", BLUEZ_INIT_TARGET]).output() {

                warn!("Failed to stop bluetoothd: {}", e);

            }

            migrate::migrate_bluez_devices();

            for hci in config_util::list_hci_devices() {

                if config_util::is_hci_n_enabled(hci) {

                    let _ = self.proxy.start_bluetooth(hci);
@@ -130,6 +131,7 @@ impl IBluetoothManager for BluetoothManager { 
                    let _ = self.proxy.stop_bluetooth(hci);

                }

            }

            migrate::migrate_floss_devices();

            if let Err(e) = Command::new("initctl").args(&["start", BLUEZ_INIT_TARGET]).output() {

                warn!("Failed to start bluetoothd: {}", e);

            }

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

+1 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ pub mod config_util; 
pub mod dbus_arg;

pub mod dbus_iface;

pub mod iface_bluetooth_manager;

pub mod migrate;

pub mod powerd_suspend_manager;

pub mod service_watcher;

pub mod state_machine;

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

0 → 100644
+791 −0

File added.

Preview size limit exceeded, changes collapsed.