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

Commit ba6cc9c0 authored Sep 14, 2024 by Treehugger Robot Committed by Automerger Merge Worker Sep 14, 2024

Merge "Add native layer logs to differentiate if new scanManagerRefactor flow...

Merge "Add native layer logs to differentiate if new scanManagerRefactor flow is being used" into main am: 42d5d7b1 am: 2e103940

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

Change-Id: I1a7eb067b3c1377b83f4ce32b97447ab58144832
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents e2a4ca8d 2e103940

android/app/jni/com_android_bluetooth_gatt.cpp

+2 −0

Original line number	Diff line number	Diff line
		@@ -1285,6 +1285,7 @@ static void initializeNative(JNIEnv* env, jobject object) {
		}

		if (com::android::bluetooth::flags::scan_manager_refactor()) {
		log::info("Starting rust module");
		btIf->start_rust_module();
		}

		@@ -1303,6 +1304,7 @@ static void cleanupNative(JNIEnv* env, jobject /* object */) {
		}

		if (com::android::bluetooth::flags::scan_manager_refactor()) {
		log::info("Stopping rust module");
		btIf->stop_rust_module();
		}

system/btif/src/stack_manager.cc

+2 −0

Original line number	Diff line number	Diff line
		@@ -325,6 +325,7 @@ static void event_start_up_stack(bluetooth::core::CoreInterface* interface,
		}

		if (!com::android::bluetooth::flags::scan_manager_refactor()) {
		info("Starting rust module");
		module_start_up(get_local_module(RUST_MODULE));
		}
		if (com::android::bluetooth::flags::channel_sounding_in_stack()) {
		@@ -350,6 +351,7 @@ static void event_shut_down_stack(ProfileStopCallback stopProfiles) {
		stack_is_running = false;

		if (!com::android::bluetooth::flags::scan_manager_refactor()) {
		info("Stopping rust module");
		module_shut_down(get_local_module(RUST_MODULE));
		}