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

Commit acb427a6 authored by Myles Watson's avatar Myles Watson
Browse files

InitFlags: Remove always_use_private_gatt 

Bug: 255880936
Fixes: 290842873
Test: mma -j32
Flag: EXEMPT, no logical change
Change-Id: Ia1d6f2ea775087680f5d34472e32d44f574854d4
parent eb389d3a

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

+0 −1
Original line number Diff line number Diff line
@@ -207,7 +207,6 @@ pub fn set_all_for_testing() { 
init_flags!(

    name: InitFlags

    flags: {

        always_use_private_gatt_for_debugging,

        bluetooth_power_telemetry = false,

        btm_dm_flush_discovery_queue_on_search_cancel,

        classic_discovery_only,

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

+0 −1
Original line number Diff line number Diff line
@@ -12,7 +12,6 @@ mod ffi { 


        fn dump() -> Vec<InitFlagWithValue>;



        fn always_use_private_gatt_for_debugging_is_enabled() -> bool;

        fn bluetooth_power_telemetry_is_enabled() -> bool;

        fn btm_dm_flush_discovery_queue_on_search_cancel_is_enabled() -> bool;

        fn classic_discovery_only_is_enabled() -> bool;

system/rust/src/gatt/ffi.rs

+2 −2
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@ 
use std::iter::Peekable;



use anyhow::{bail, Result};

use bt_common::init_flags::always_use_private_gatt_for_debugging_is_enabled;

use cxx::UniquePtr;

pub use inner::*;

use log::{error, info, trace, warn};
@@ -281,7 +280,8 @@ fn open_server(server_id: u8) { 
    let server_id = ServerId(server_id);



    do_in_rust_thread(move |modules| {

        if always_use_private_gatt_for_debugging_is_enabled() {

        if false {

            // Enable to always use private GATT for debugging

            modules

                .gatt_module

                .get_isolation_manager()

system/rust/src/gatt/server.rs

+2 −2
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ use super::{ 
    ids::{AdvertiserId, AttHandle, TransportIndex},

};

use anyhow::{anyhow, bail, Result};

use bt_common::init_flags::always_use_private_gatt_for_debugging_is_enabled;

use log::info;



pub use indication_handler::IndicationError;
@@ -157,7 +156,8 @@ impl GattModule { 
            bail!("GATT server {server_id:?} did not exist")

        };



        if !always_use_private_gatt_for_debugging_is_enabled() {

        if true {

            // Disable to always use private gatt for debugging

            self.isolation_manager.lock().unwrap().clear_server(server_id);

        }