Snap for 11981331 from 4dddbdda5ce8ee6bb04e6a518de20126b85b6119 to 24Q4-release (80dc5403) · Commits · e / os / android_packages_modules_Bluetooth

PREUPLOAD.cfg

+8 −1

Original line number	Diff line number	Diff line
		@@ -14,12 +14,19 @@ rustfmt = true
		[Builtin Hooks Options]
		bpfmt = -s
		clang_format = --commit ${PREUPLOAD_COMMIT} --style file --extensions c,h,cc,cpp,hpp
		google_java_format= --sort-imports
		ktfmt = --kotlinlang-style
		rustfmt = --config-path=rustfmt.toml

		[Hook Scripts]
		aosp_first = ${REPO_ROOT}/frameworks/base/tools/aosp/aosp_sha.sh ${PREUPLOAD_COMMIT} ${PREUPLOAD_FILES}
		# google_java_format only fixes indentation. This has Android specific checks like "m" prefix.
		checkstyle_hook = ${REPO_ROOT}/prebuilts/checkstyle/checkstyle.py --sha ${PREUPLOAD_COMMIT}
		--config_xml checkstyle.xml
		-fw android/app/src/com/android/bluetooth/
		android/app/lib/mapapi/com/android/bluetooth/mapapi/
		android/app/tests/src/com/android/bluetooth/
		framework/
		service/
		yapf_hook = ./system/tools/scripts/yapf_checker.py

		[Tool Paths]

android/app/Android.bp

+15 −2

Original line number	Diff line number	Diff line
		@@ -101,6 +101,7 @@ cc_library_shared {
		"lib-bt-packets-avrcp",
		"lib-bt-packets-base",
		"libFraunhoferAAC",
		"libaconfig_storage_read_api_cc",
		"libaudio-a2dp-hw-utils",
		"libbase",
		"libbluetooth",
		@@ -130,7 +131,6 @@ cc_library_shared {
		"libbte",
		"libbtif",
		"libbtif-core",
		"libc++fs",
		"libchrome",
		"libcutils",
		"libevent",
		@@ -164,6 +164,10 @@ cc_library_shared {
		"com.android.btservices",
		],
		min_sdk_version: "Tiramisu",
		ldflags: ["-Wl,--allow-multiple-definition"],

		// TODO(b/346919576) Workaround LTO build breakage.
		lto_O0: true,
		}

		cc_library {
		@@ -190,7 +194,6 @@ cc_library {
		"libosi",

		"libbluetooth-types",
		"libc++fs",
		],
		cflags: [
		/* we export all classes, so change default visibility, instead of having EXPORT_SYMBOL on each class*/
		@@ -315,9 +318,19 @@ android_app {
		"com.android.btservices",
		],
		errorprone: {
		enabled: true,
		javacflags: [
		// "-Xep:AndroidFrameworkRequiresPermission:ERROR",
		"-Xep:AlmostJavadoc:ERROR",
		"-Xep:BadImport:ERROR",
		"-Xep:ClassCanBeStatic:ERROR",
		"-Xep:EmptyBlockTag:ERROR",
		"-Xep:InlineMeInliner:ERROR",
		"-Xep:InvalidBlockTag:ERROR",
		"-Xep:InvalidParam:ERROR",
		"-Xep:MockNotUsedInProduction:ERROR",
		"-Xep:NonCanonicalType:ERROR",
		"-Xep:ReturnAtTheEndOfVoidFunction:ERROR",
		"-Xep:UnusedMethod:ERROR",
		"-Xep:UnusedVariable:ERROR",
		"-XepExcludedPaths:./srcjars/.", // Exclude generated files

android/app/AndroidManifest.xml

+0 −1

Original line number	Diff line number	Diff line
		@@ -110,7 +110,6 @@
		android:permission="android.permission.BLUETOOTH_PRIVILEGED">
		<intent-filter>
		<action android:name="android.bluetooth.notification.action.SEND_TOGGLE_NOTIFICATION"/>
		<action android:name="android.bluetooth.notification.action.AUTO_ON_USER_ACTION"/>
		</intent-filter>
		</service>

android/app/jni/com_android_bluetooth_gatt.cpp

+80 −77

Original line number	Diff line number	Diff line
		@@ -28,6 +28,7 @@
		#include "common/init_flags.h"
		#include "hardware/bt_gatt.h"
		#include "hardware/bt_gatt_types.h"
		#include "main/shim/le_scanning_manager.h"
		#include "rust/cxx.h"
		#include "rust/src/gatt/ffi/gatt_shim.h"
		#include "src/gatt/ffi.rs.h"
		@@ -102,7 +103,6 @@ namespace android {
		/**
		* Client callback methods
		*/

		static jmethodID method_onClientRegistered;
		static jmethodID method_onConnected;
		static jmethodID method_onDisconnected;
		@@ -185,6 +185,7 @@ static jmethodID method_onSyncReport;
		static jmethodID method_onSyncStarted;
		static jmethodID method_onSyncTransferredCallback;
		static jmethodID method_onBigInfoReport;

		/**
		* Distance Measurement callback methods
		*/
		@@ -197,6 +198,8 @@ static jmethodID method_onDistanceMeasurementResult;
		* Static variables
		*/
		static const btgatt_interface_t* sGattIf = NULL;
		/** Pointer to the LE scanner interface methods.*/
		static BleScannerInterface* sScanner = NULL;
		static jobject mCallbacksObj = NULL;
		static jobject mScanCallbacksObj = NULL;
		static jobject mAdvertiseCallbacksObj = NULL;
		@@ -304,16 +307,16 @@ void btgattc_notify_cb(int conn_id, const btgatt_notify_params_t& p_data) {
		}

		void btgattc_read_characteristic_cb(int conn_id, int status,
		btgatt_read_params_t* p_data) {
		const btgatt_read_params_t& p_data) {
		std::shared_lock<std::shared_mutex> lock(callbacks_mutex);
		CallbackEnv sCallbackEnv(__func__);
		if (!sCallbackEnv.valid() \|\| !mCallbacksObj) return;

		ScopedLocalRef<jbyteArray> jb(sCallbackEnv.get(), NULL);
		if (status == 0) { // Success
		jb.reset(sCallbackEnv->NewByteArray(p_data->value.len));
		sCallbackEnv->SetByteArrayRegion(jb.get(), 0, p_data->value.len,
		(jbyte*)p_data->value.value);
		jb.reset(sCallbackEnv->NewByteArray(p_data.value.len));
		sCallbackEnv->SetByteArrayRegion(jb.get(), 0, p_data.value.len,
		(jbyte*)p_data.value.value);
		} else {
		uint8_t value = 0;
		jb.reset(sCallbackEnv->NewByteArray(1));
		@@ -321,7 +324,7 @@ void btgattc_read_characteristic_cb(int conn_id, int status,
		}

		sCallbackEnv->CallVoidMethod(mCallbacksObj, method_onReadCharacteristic,
		conn_id, status, p_data->handle, jb.get());
		conn_id, status, p_data.handle, jb.get());
		}

		void btgattc_write_characteristic_cb(int conn_id, int status, uint16_t handle,
		@@ -1278,7 +1281,6 @@ static void initializeNative(JNIEnv* env, jobject object) {

		sGattIf->advertiser->RegisterCallbacks(
		JniAdvertisingCallbacks::GetInstance());
		sGattIf->scanner->RegisterCallbacks(JniScanningCallbacks::GetInstance());
		sGattIf->distance_measurement_manager->RegisterDistanceMeasurementCallbacks(
		JniDistanceMeasurementCallbacks::GetInstance());

		@@ -1337,24 +1339,24 @@ void btgattc_register_scanner_cb(const Uuid& app_uuid, uint8_t scannerId,

		static void registerScannerNative(JNIEnv* /* env /, jobject / object */,
		jlong app_uuid_lsb, jlong app_uuid_msb) {
		if (!sGattIf) return;
		if (!sScanner) return;

		Uuid uuid = from_java_uuid(app_uuid_msb, app_uuid_lsb);
		sGattIf->scanner->RegisterScanner(
		uuid, base::Bind(&btgattc_register_scanner_cb, uuid));
		sScanner->RegisterScanner(uuid,
		base::Bind(&btgattc_register_scanner_cb, uuid));
		}

		static void unregisterScannerNative(JNIEnv* /* env /, jobject / object */,
		jint scanner_id) {
		if (!sGattIf) return;
		if (!sScanner) return;

		sGattIf->scanner->Unregister(scanner_id);
		sScanner->Unregister(scanner_id);
		}

		static void gattClientScanNative(JNIEnv* /* env /, jobject / object */,
		jboolean start) {
		if (!sGattIf) return;
		sGattIf->scanner->Scan(start);
		if (!sScanner) return;
		sScanner->Scan(start);
		}

		static void gattClientConnectNative(JNIEnv* env, jobject /* object */,
		@@ -1548,10 +1550,9 @@ void set_scan_params_cmpl_cb(int client_if, uint8_t status) {
		static void gattSetScanParametersNative(JNIEnv* /* env /, jobject / object */,
		jint client_if, jint scan_interval_unit,
		jint scan_window_unit, jint scan_phy) {
		if (!sGattIf) return;
		sGattIf->scanner->SetScanParameters(
		client_if, /* use active scan */ 0x01, scan_interval_unit,
		scan_window_unit, scan_phy,
		if (!sScanner) return;
		sScanner->SetScanParameters(client_if, /* use active scan */ 0x01,
		scan_interval_unit, scan_window_unit, scan_phy,
		base::Bind(&set_scan_params_cmpl_cb, client_if));
		}

		@@ -1568,7 +1569,7 @@ void scan_filter_param_cb(uint8_t client_if, uint8_t avbl_space, uint8_t action,
		static void gattClientScanFilterParamAddNative(JNIEnv* env,
		jobject /* object */,
		jobject params) {
		if (!sGattIf) return;
		if (!sScanner) return;
		const int add_scan_filter_params_action = 0;
		auto filt_params = std::make_unique<btgatt_filt_param_setup_t>();

		@@ -1611,30 +1612,30 @@ static void gattClientScanFilterParamAddNative(JNIEnv* env,
		methodId = env->GetMethodID(filtparam.get(), "getRSSILowValue", "()I");
		filt_params->rssi_low_thres = env->CallIntMethod(params, methodId);

		sGattIf->scanner->ScanFilterParamSetup(
		client_if, add_scan_filter_params_action, filt_index,
		std::move(filt_params), base::Bind(&scan_filter_param_cb, client_if));
		sScanner->ScanFilterParamSetup(client_if, add_scan_filter_params_action,
		filt_index, std::move(filt_params),
		base::Bind(&scan_filter_param_cb, client_if));
		}

		static void gattClientScanFilterParamDeleteNative(JNIEnv* /* env */,
		jobject /* object */,
		jint client_if,
		jint filt_index) {
		if (!sGattIf) return;
		if (!sScanner) return;
		const int delete_scan_filter_params_action = 1;
		sGattIf->scanner->ScanFilterParamSetup(
		client_if, delete_scan_filter_params_action, filt_index, nullptr,
		sScanner->ScanFilterParamSetup(client_if, delete_scan_filter_params_action,
		filt_index, nullptr,
		base::Bind(&scan_filter_param_cb, client_if));
		}

		static void gattClientScanFilterParamClearAllNative(JNIEnv* /* env */,
		jobject /* object */,
		jint client_if) {
		if (!sGattIf) return;
		if (!sScanner) return;
		const int clear_scan_filter_params_action = 2;
		sGattIf->scanner->ScanFilterParamSetup(
		client_if, clear_scan_filter_params_action, 0 /* index, unused */,
		nullptr, base::Bind(&scan_filter_param_cb, client_if));
		sScanner->ScanFilterParamSetup(client_if, clear_scan_filter_params_action,
		0 /* index, unused */, nullptr,
		base::Bind(&scan_filter_param_cb, client_if));
		}

		static void scan_filter_cfg_cb(uint8_t client_if, uint8_t filt_type,
		@@ -1651,7 +1652,7 @@ static void scan_filter_cfg_cb(uint8_t client_if, uint8_t filt_type,
		static void gattClientScanFilterAddNative(JNIEnv* env, jobject /* object */,
		jint client_if, jobjectArray filters,
		jint filter_index) {
		if (!sGattIf) return;
		if (!sScanner) return;

		jmethodID uuidGetMsb;
		jmethodID uuidGetLsb;
		@@ -1666,7 +1667,7 @@ static void gattClientScanFilterAddNative(JNIEnv* env, jobject /* object */,

		int numFilters = env->GetArrayLength(filters);
		if (numFilters == 0) {
		sGattIf->scanner->ScanFilterAdd(filter_index, std::move(native_filters),
		sScanner->ScanFilterAdd(filter_index, std::move(native_filters),
		base::Bind(&scan_filter_cfg_cb, client_if));
		return;
		}
		@@ -1805,15 +1806,15 @@ static void gattClientScanFilterAddNative(JNIEnv* env, jobject /* object */,
		native_filters.push_back(curr);
		}

		sGattIf->scanner->ScanFilterAdd(filter_index, std::move(native_filters),
		sScanner->ScanFilterAdd(filter_index, std::move(native_filters),
		base::Bind(&scan_filter_cfg_cb, client_if));
		}

		static void gattClientScanFilterClearNative(JNIEnv* /* env */,
		jobject /* object */,
		jint client_if, jint filt_index) {
		if (!sGattIf) return;
		sGattIf->scanner->ScanFilterClear(filt_index,
		if (!sScanner) return;
		sScanner->ScanFilterClear(filt_index,
		base::Bind(&scan_filter_cfg_cb, client_if));
		}

		@@ -1829,9 +1830,8 @@ void scan_enable_cb(uint8_t client_if, uint8_t action, uint8_t status) {
		static void gattClientScanFilterEnableNative(JNIEnv* /* env */,
		jobject /* object */,
		jint client_if, jboolean enable) {
		if (!sGattIf) return;
		sGattIf->scanner->ScanFilterEnable(enable,
		base::Bind(&scan_enable_cb, client_if));
		if (!sScanner) return;
		sScanner->ScanFilterEnable(enable, base::Bind(&scan_enable_cb, client_if));
		}

		static void gattClientConfigureMTUNative(JNIEnv* /* env */,
		@@ -1875,8 +1875,8 @@ static void gattClientConfigBatchScanStorageNative(
		JNIEnv* /* env /, jobject / object */, jint client_if,
		jint max_full_reports_percent, jint max_trunc_reports_percent,
		jint notify_threshold_level_percent) {
		if (!sGattIf) return;
		sGattIf->scanner->BatchscanConfigStorage(
		if (!sScanner) return;
		sScanner->BatchscanConfigStorage(
		client_if, max_full_reports_percent, max_trunc_reports_percent,
		notify_threshold_level_percent,
		base::Bind(&batchscan_cfg_storage_cb, client_if));
		@@ -1897,30 +1897,30 @@ static void gattClientStartBatchScanNative(JNIEnv* /* env */,
		jint scan_interval_unit,
		jint scan_window_unit,
		jint addr_type, jint discard_rule) {
		if (!sGattIf) return;
		sGattIf->scanner->BatchscanEnable(
		scan_mode, scan_interval_unit, scan_window_unit, addr_type, discard_rule,
		if (!sScanner) return;
		sScanner->BatchscanEnable(scan_mode, scan_interval_unit, scan_window_unit,
		addr_type, discard_rule,
		base::Bind(&batchscan_enable_cb, client_if));
		}

		static void gattClientStopBatchScanNative(JNIEnv* /* env */,
		jobject /* object */,
		jint client_if) {
		if (!sGattIf) return;
		sGattIf->scanner->BatchscanDisable(
		base::Bind(&batchscan_enable_cb, client_if));
		if (!sScanner) return;
		sScanner->BatchscanDisable(base::Bind(&batchscan_enable_cb, client_if));
		}

		static void gattClientReadScanReportsNative(JNIEnv* /* env */,
		jobject /* object */,
		jint client_if, jint scan_type) {
		if (!sGattIf) return;
		sGattIf->scanner->BatchscanReadReports(client_if, scan_type);
		if (!sScanner) return;
		sScanner->BatchscanReadReports(client_if, scan_type);
		}

		/**
		* Native server functions
		*/

		static void gattServerRegisterAppNative(JNIEnv* /* env /, jobject / object */,
		jlong app_uuid_lsb, jlong app_uuid_msb,
		jboolean eatt_support) {
		@@ -2469,6 +2469,10 @@ static void periodicScanCleanupNative(JNIEnv* env, jobject /* object */) {

		static void scanInitializeNative(JNIEnv* env, jobject object) {
		std::unique_lock<std::shared_mutex> lock(callbacks_mutex);

		sScanner = bluetooth::shim::get_ble_scanner_instance();
		sScanner->RegisterCallbacks(JniScanningCallbacks::GetInstance());

		if (mScanCallbacksObj != NULL) {
		log::warn("Cleaning up scan callback object");
		env->DeleteGlobalRef(mScanCallbacksObj);
		@@ -2484,42 +2488,44 @@ static void scanCleanupNative(JNIEnv* env, jobject /* object */) {
		env->DeleteGlobalRef(mScanCallbacksObj);
		mScanCallbacksObj = NULL;
		}
		if (sScanner != NULL) {
		sScanner = NULL;
		}
		}

		static void startSyncNative(JNIEnv* env, jobject /* object */, jint sid,
		jstring address, jint skip, jint timeout,
		jint reg_id) {
		if (!sGattIf) return;
		sGattIf->scanner->StartSync(sid, str2addr(env, address), skip, timeout,
		reg_id);
		if (!sScanner) return;
		sScanner->StartSync(sid, str2addr(env, address), skip, timeout, reg_id);
		}

		static void stopSyncNative(JNIEnv* /* env /, jobject / object */,
		jint sync_handle) {
		if (!sGattIf) return;
		sGattIf->scanner->StopSync(sync_handle);
		if (!sScanner) return;
		sScanner->StopSync(sync_handle);
		}

		static void cancelSyncNative(JNIEnv* env, jobject /* object */, jint sid,
		jstring address) {
		if (!sGattIf) return;
		sGattIf->scanner->CancelCreateSync(sid, str2addr(env, address));
		if (!sScanner) return;
		sScanner->CancelCreateSync(sid, str2addr(env, address));
		}

		static void syncTransferNative(JNIEnv* env, jobject /* object */,
		jint pa_source, jstring addr, jint service_data,
		jint sync_handle) {
		if (!sGattIf) return;
		sGattIf->scanner->TransferSync(str2addr(env, addr), service_data, sync_handle,
		if (!sScanner) return;
		sScanner->TransferSync(str2addr(env, addr), service_data, sync_handle,
		pa_source);
		}

		static void transferSetInfoNative(JNIEnv* env, jobject /* object */,
		jint pa_source, jstring addr,
		jint service_data, jint adv_handle) {
		if (!sGattIf) return;
		sGattIf->scanner->TransferSetInfo(str2addr(env, addr), service_data,
		adv_handle, pa_source);
		if (!sScanner) return;
		sScanner->TransferSetInfo(str2addr(env, addr), service_data, adv_handle,
		pa_source);
		}

		static void gattTestNative(JNIEnv* env, jobject /* object */, jint command,
		@@ -2578,15 +2584,10 @@ static void stopDistanceMeasurementNative(JNIEnv* env, jobject /* object */,
		}

		/**
		* JNI function definitinos
		* JNI function definitions
		*/

		// JNI functions defined in AdvertiseManagerNativeInterface class.

		// JNI functions defined in PeriodicScanManager class.
		// JNI functions defined in DistanceMeasurementManager class.

		// JNI functions defined in GattNativeInterface class.
		// JNI functions defined in ScanNativeInterface class.
		static int register_com_android_bluetooth_gatt_scan(JNIEnv* env) {
		const JNINativeMethod methods[] = {
		{"initializeNative", "()V", (void*)scanInitializeNative},
		@@ -2657,6 +2658,7 @@ static int register_com_android_bluetooth_gatt_scan(JNIEnv* env) {
		return 0;
		}

		// JNI functions defined in AdvertiseManagerNativeInterface class.
		static int register_com_android_bluetooth_gatt_advertise_manager(JNIEnv* env) {
		const JNINativeMethod methods[] = {
		{"initializeNative", "()V", (void*)advertiseInitializeNative},
		@@ -2707,10 +2709,10 @@ static int register_com_android_bluetooth_gatt_advertise_manager(JNIEnv* env) {
		GET_JAVA_METHODS(env,
		"com/android/bluetooth/gatt/AdvertiseManagerNativeInterface",
		javaMethods);

		return 0;
		}

		// JNI functions defined in PeriodicScanNativeInterface class.
		static int register_com_android_bluetooth_gatt_periodic_scan(JNIEnv* env) {
		const JNINativeMethod methods[] = {
		{"initializeNative", "()V", (void*)periodicScanInitializeNative},
		@@ -2724,7 +2726,8 @@ static int register_com_android_bluetooth_gatt_periodic_scan(JNIEnv* env) {
		(void*)transferSetInfoNative},
		};
		const int result = REGISTER_NATIVE_METHODS(
		env, "com/android/bluetooth/le_scan/PeriodicScanNativeInterface", methods);
		env, "com/android/bluetooth/le_scan/PeriodicScanNativeInterface",
		methods);
		if (result != 0) {
		return result;
		}
		@@ -2740,10 +2743,10 @@ static int register_com_android_bluetooth_gatt_periodic_scan(JNIEnv* env) {
		GET_JAVA_METHODS(env,
		"com/android/bluetooth/le_scan/PeriodicScanNativeInterface",
		javaMethods);

		return 0;
		}

		// JNI functions defined in DistanceMeasurementNativeInterface class.
		static int register_com_android_bluetooth_gatt_distance_measurement(
		JNIEnv* env) {
		const JNINativeMethod methods[] = {
		@@ -2774,10 +2777,10 @@ static int register_com_android_bluetooth_gatt_distance_measurement(
		GET_JAVA_METHODS(
		env, "com/android/bluetooth/gatt/DistanceMeasurementNativeInterface",
		javaMethods);

		return 0;
		}

		// JNI functions defined in GattNativeInterface class.
		static int register_com_android_bluetooth_gatt_(JNIEnv* env) {
		const JNINativeMethod methods[] = {
		{"initializeNative", "()V", (void*)initializeNative},

android/app/lib/mapapi/com/android/bluetooth/mapapi/BluetoothMapContract.java

+542 −621

File changed.

Preview size limit exceeded, changes collapsed.