Snap for 7398294 from 039a371a2f04ab6ebde957bf7185169674e4f989 to sc-release (51359f22) · Commits · e / os / android_packages_modules_Bluetooth

system/btif/src/bluetooth.cc

+2 −2

Original line number	Diff line number	Diff line
		@@ -526,14 +526,14 @@ int le_test_mode(uint16_t opcode, uint8_t* buf, uint8_t len) {
		static bt_os_callouts_t* wakelock_os_callouts_saved = nullptr;

		static int acquire_wake_lock_cb(const char* lock_name) {
		return do_in_main_thread(
		return do_in_jni_thread(
		FROM_HERE, base::Bind(base::IgnoreResult(
		wakelock_os_callouts_saved->acquire_wake_lock),
		lock_name));
		}

		static int release_wake_lock_cb(const char* lock_name) {
		return do_in_main_thread(
		return do_in_jni_thread(
		FROM_HERE, base::Bind(base::IgnoreResult(
		wakelock_os_callouts_saved->release_wake_lock),
		lock_name));

system/gd/Android.bp

+8 −0

Original line number	Diff line number	Diff line
		@@ -140,6 +140,7 @@ cc_defaults {
		"android.hardware.bluetooth@1.0",
		"android.hardware.bluetooth@1.1",
		"android.system.suspend.control-V1-ndk",
		"android.system.suspend@1.0",
		"libbinder_ndk",
		"libcutils",
		"libhidlbase",
		@@ -260,6 +261,7 @@ cc_binary {
		"android.hardware.bluetooth@1.0",
		"android.hardware.bluetooth@1.1",
		"android.system.suspend.control-V1-ndk",
		"android.system.suspend@1.0",
		"libbinder_ndk",
		"libhidlbase",
		"libutils",
		@@ -311,6 +313,7 @@ cc_test {
		"android.hardware.bluetooth@1.0",
		"android.hardware.bluetooth@1.1",
		"android.system.suspend.control-V1-ndk",
		"android.system.suspend@1.0",
		"libbinder_ndk",
		"libhidlbase",
		"libutils",
		@@ -392,6 +395,7 @@ cc_test {
		"android.hardware.bluetooth@1.0",
		"android.hardware.bluetooth@1.1",
		"android.system.suspend.control-V1-ndk",
		"android.system.suspend@1.0",
		"libbinder_ndk",
		"libhidlbase",
		"libutils",
		@@ -661,6 +665,7 @@ genrule {
		"hci/hci_acl_manager.fbs",
		"l2cap/classic/l2cap_classic_module.fbs",
		"shim/dumpsys.fbs",
		"os/wakelock_manager.fbs",
		],
		out: [
		"activity_attribution.bfbs",
		@@ -669,6 +674,7 @@ genrule {
		"dumpsys_data.bfbs",
		"hci_acl_manager.bfbs",
		"l2cap_classic_module.bfbs",
		"wakelock_manager.bfbs",
		],
		}

		@@ -685,6 +691,7 @@ genrule {
		"hci/hci_acl_manager.fbs",
		"l2cap/classic/l2cap_classic_module.fbs",
		"shim/dumpsys.fbs",
		"os/wakelock_manager.fbs",
		],
		out: [
		"activity_attribution_generated.h",
		@@ -693,6 +700,7 @@ genrule {
		"hci_acl_manager_generated.h",
		"init_flags_generated.h",
		"l2cap_classic_module_generated.h",
		"wakelock_manager_generated.h",
		],
		}

system/gd/dumpsys_data.fbs

+2 −0

Original line number	Diff line number	Diff line
		@@ -4,6 +4,7 @@ include "common/init_flags.fbs";
		include "l2cap/classic/l2cap_classic_module.fbs";
		include "hci/hci_acl_manager.fbs";
		include "module_unittest.fbs";
		include "os/wakelock_manager.fbs";
		include "shim/dumpsys.fbs";

		namespace bluetooth;
		@@ -13,6 +14,7 @@ attribute "privacy";
		table DumpsysData {
		title:string;
		init_flags:common.InitFlagsData (privacy:"Any");
		wakelock_manager_data:bluetooth.os.WakelockManagerData (privacy:"Any");
		shim_dumpsys_data:bluetooth.shim.DumpsysModuleData (privacy:"Any");
		l2cap_classic_dumpsys_data:bluetooth.l2cap.classic.L2capClassicModuleData (privacy:"Any");
		hci_acl_manager_dumpsys_data:bluetooth.hci.AclManagerData (privacy:"Any");

system/gd/module.cc

+4 −0

Original line number	Diff line number	Diff line
		@@ -18,9 +18,11 @@
		#include "module.h"
		#include "common/init_flags.h"
		#include "dumpsys/init_flags.h"
		#include "os/wakelock_manager.h"

		using ::bluetooth::os::Handler;
		using ::bluetooth::os::Thread;
		using ::bluetooth::os::WakelockManager;

		namespace bluetooth {

		@@ -139,6 +141,7 @@ void ModuleDumper::DumpState(std::string* output) const {
		auto title = builder.CreateString(title_);

		auto init_flags_offset = dumpsys::InitFlags::Dump(&builder);
		auto wakelock_offset = WakelockManager::Get().GetDumpsysData(&builder);

		std::queue<DumpsysDataFinisher> queue;
		for (auto it = module_registry_.start_order_.rbegin(); it != module_registry_.start_order_.rend(); it++) {
		@@ -150,6 +153,7 @@ void ModuleDumper::DumpState(std::string* output) const {
		DumpsysDataBuilder data_builder(builder);
		data_builder.add_title(title);
		data_builder.add_init_flags(init_flags_offset);
		data_builder.add_wakelock_manager_data(wakelock_offset);

		while (!queue.empty()) {
		queue.front()(&data_builder);

system/gd/os/Android.bp

+5 −0

Original line number	Diff line number	Diff line
		@@ -13,6 +13,7 @@ filegroup {
		"android/metrics.cc",
		"android/parameter_provider.cc",
		"android/system_properties.cc",
		"android/wakelock_native.cc",
		],
		}

		@@ -20,6 +21,7 @@ filegroup {
		name: "BluetoothOsTestSources_android",
		srcs: [
		"android/system_properties_test.cc",
		"android/wakelock_native_test.cc",
		],
		}

		@@ -29,6 +31,7 @@ filegroup {
		"host/metrics.cc",
		"host/parameter_provider.cc",
		"host/system_properties.cc",
		"host/wakelock_native.cc",
		],
		}

		@@ -50,6 +53,7 @@ filegroup {
		"linux_generic/repeating_alarm.cc",
		"linux_generic/reactive_semaphore.cc",
		"linux_generic/thread.cc",
		"linux_generic/wakelock_manager.cc",
		],
		}

		@@ -63,6 +67,7 @@ filegroup {
		"linux_generic/reactor_unittest.cc",
		"linux_generic/repeating_alarm_unittest.cc",
		"linux_generic/thread_unittest.cc",
		"linux_generic/wakelock_manager_unittest.cc",
		],
		}