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

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

Merge "InitFlags: Remove classic_discovery_only" into main am: 1ec53726 am: b5d5dc00 

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



Change-Id: I6fed1bc8fdf181deaef4da3f1a6165296770c2f0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0dbc0536 b5d5dc00

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: {

        classic_discovery_only,

        hci_adapter: i32,

        use_unified_connection_manager,

    }

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

+0 −3
Original line number Diff line number Diff line
@@ -121,9 +121,6 @@ fn main() -> Result<(), Box<dyn Error>> { 
        }

    }



    // Always treat discovery as classic only

    init_flags.push(String::from("INIT_classic_discovery_only=true"));



    let (tx, rx) = Stack::create_channel();

    let (api_tx, api_rx) = interface_manager::InterfaceManager::create_channel();

    let sig_notifier = Arc::new(SigData {

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 classic_discovery_only_is_enabled() -> bool;

        fn get_hci_adapter() -> i32;

        fn use_unified_connection_manager_is_enabled() -> bool;

    }

system/main/shim/shim.cc

+0 −4
Original line number Diff line number Diff line
@@ -66,7 +66,3 @@ bool bluetooth::shim::is_gd_stack_started_up() { 
bool bluetooth::shim::is_gd_dumpsys_module_started() {

  return bluetooth::shim::Stack::GetInstance()->IsDumpsysModuleStarted();

}
 


bool bluetooth::shim::is_classic_discovery_only_enabled() {

  return bluetooth::common::init_flags::classic_discovery_only_is_enabled();

}

system/main/shim/shim.h

+0 −7
Original line number Diff line number Diff line
@@ -47,12 +47,5 @@ bool is_gd_stack_started_up(); 
 */

bool is_gd_dumpsys_module_started();



/**

 * Checks whether discovery should be classic only (vs also triggering BLE).

 *

 * @return true if discovery should be limited to classic.

 */

bool is_classic_discovery_only_enabled();



}  // namespace shim

}  // namespace bluetooth