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

Commit 610ee172 authored by Zhengping Jiang's avatar Zhengping Jiang Committed by Automerger Merge Worker
Browse files

Merge "floss: save address privacy setting to backup file for restoration" into main am: ecb352f5 

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



Change-Id: Ib0399360cc48da5df59dcd44d222d3d6bd1894e3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1ec2d6df ecb352f5

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

+8 −2
Original line number Diff line number Diff line
@@ -17,6 +17,10 @@ const BTMANAGERD_CONF: &str = "/var/lib/bluetooth/btmanagerd.json"; 
/// Folder to keep files which override floss configuration

const FLOSS_SYSPROPS_OVERRIDE_DIR: &str = "/var/lib/bluetooth/sysprops.conf.d";



/// File to persist the address privacy setting

const FLOSS_ADDRESS_PRIVACY_CONFIG_SAVE: &str =

    "/var/lib/bluetooth/privacy_address_override.conf.save";



/// Key used for default adapter entry.

const DEFAULT_ADAPTER_KEY: &str = "default_adapter";
@@ -242,8 +246,10 @@ pub fn write_floss_address_privacy_enabled(enabled: bool) -> std::io::Result<()> 


    std::fs::write(

        format!("{}/{}", FLOSS_SYSPROPS_OVERRIDE_DIR, "privacy_address_override.conf"),

        data,

    )

        data.clone(),

    )?;



    std::fs::write(format!("{}", FLOSS_ADDRESS_PRIVACY_CONFIG_SAVE), data.clone())

}



#[cfg(test)]