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

Commit fb3f85ce authored by Chris Manton's avatar Chris Manton Committed by Automerger Merge Worker
Browse files

legacy: Decouple gd_advertisting and gd_scanning flags am: 60db7ff3 am: cc871fb9 

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

Change-Id: I5c42fbe8eaa7c9bb841fe3c28fa2db68196a2690
parents 7b6e80b7 cc871fb9

system/gd/rust/common/src/init_flags.rs

+8 −5
Original line number Original line Diff line number Diff line
@@ -3,6 +3,13 @@ use paste::paste; 
use std::sync::Mutex;

use std::sync::Mutex;





/// Deprecated immutable flag

/// Deprecated immutable flag

pub fn gd_advertising_is_enabled() -> bool {

    true

}

/// Deprecated immutable flag

pub fn gd_scanning_is_enabled() -> bool {

    true

}





macro_rules! init_flags {

macro_rules! init_flags {

    (flags: { $($flag:ident),* }, dependencies: { $($parent:ident => $child:ident),* }) => {

    (flags: { $($flag:ident),* }, dependencies: { $($parent:ident => $child:ident),* }) => {
@@ -77,8 +84,6 @@ macro_rules! init_flags { 
init_flags!(

init_flags!(

    flags: {

    flags: {

        gd_core,

        gd_core,

        gd_advertising,

        gd_scanning,

        gd_security,

        gd_security,

        gd_l2cap,

        gd_l2cap,

        gatt_robust_caching,

        gatt_robust_caching,
@@ -87,9 +92,7 @@ init_flags!( 
        gd_link_policy

        gd_link_policy

    },

    },

    dependencies: {

    dependencies: {

        gd_core => gd_security,

        gd_core => gd_security

        gd_l2cap => gd_scanning,

        gd_scanning => gd_advertising

    }

    }

);

);