Merge "Remove unused parameters from bt_interface_t::init" into main (5e5ca0ac) · Commits · e / os / android_packages_modules_Bluetooth

android/app/jni/com_android_bluetooth_btservice_AdapterService.cpp

+3 −7

Original line number	Diff line number	Diff line
		@@ -1020,7 +1020,7 @@ int hal_util_load_bt_library(const bt_interface_t** interface) {
		}

		static bool initNative(JNIEnv* env, jobject obj, jboolean isGuest, jboolean isCommonCriteriaMode,
		int configCompareResult, jboolean isAtvDevice, jstring userDataDirectory) {
		int configCompareResult, jboolean isAtvDevice) {
		std::unique_lock<std::shared_timed_mutex> lock(jniObjMutex);

		log::verbose("");
		@@ -1035,14 +1035,10 @@ static bool initNative(JNIEnv* env, jobject obj, jboolean isGuest, jboolean isCo
		return JNI_FALSE;
		}

		const char* user_data_directory = env->GetStringUTFChars(userDataDirectory, NULL);

		int ret =
		sBluetoothInterface->init(&sBluetoothCallbacks, isGuest == JNI_TRUE ? 1 : 0,
		isCommonCriteriaMode == JNI_TRUE ? 1 : 0, configCompareResult,
		nullptr, isAtvDevice == JNI_TRUE ? 1 : 0, user_data_directory);

		env->ReleaseStringUTFChars(userDataDirectory, user_data_directory);
		isAtvDevice == JNI_TRUE ? 1 : 0);

		if (ret != BT_STATUS_SUCCESS) {
		log::error("Error while setting the callbacks: {}", ret);
		@@ -2225,7 +2221,7 @@ static jboolean restoreFilterAcceptListNative(JNIEnv* /* env /, jobject / obj

		int register_com_android_bluetooth_btservice_AdapterService(JNIEnv* env) {
		const JNINativeMethod methods[] = {
		{"initNative", "(ZZIZLjava/lang/String;)Z", reinterpret_cast<void*>(initNative)},
		{"initNative", "(ZZIZ)Z", reinterpret_cast<void*>(initNative)},
		{"cleanupNative", "()V", reinterpret_cast<void*>(cleanupNative)},
		{"enableNative", "()Z", reinterpret_cast<void*>(enableNative)},
		{"disableNative", "()Z", reinterpret_cast<void*>(disableNative)},

android/app/src/com/android/bluetooth/btservice/AdapterNativeInterface.java

+3 −6

Original line number	Diff line number	Diff line
		@@ -64,15 +64,13 @@ public class AdapterNativeInterface {
		boolean startRestricted,
		boolean isCommonCriteriaMode,
		int configCompareResult,
		boolean isAtvDevice,
		String userDataDirectory) {
		boolean isAtvDevice) {
		mJniCallbacks = new JniCallbacks(service, adapterProperties);
		return initNative(
		startRestricted,
		isCommonCriteriaMode,
		configCompareResult,
		isAtvDevice,
		userDataDirectory);
		isAtvDevice);
		}

		void cleanup() {
		@@ -295,8 +293,7 @@ public class AdapterNativeInterface {
		boolean startRestricted,
		boolean isCommonCriteriaMode,
		int configCompareResult,
		boolean isAtvDevice,
		String userDataDirectory);
		boolean isAtvDevice);

		private native void cleanupNative();

android/app/src/com/android/bluetooth/btservice/AdapterService.java

+1 −2

Original line number	Diff line number	Diff line
		@@ -700,8 +700,7 @@ public class AdapterService extends Service {
		mUserManager.isGuestUser(),
		isCommonCriteriaMode,
		configCompareResult,
		isAtvDevice,
		getApplicationInfo().dataDir);
		isAtvDevice);
		mNativeAvailable = true;
		// Load the name and address
		mNativeInterface.getAdapterProperty(AbstractionLayer.BT_PROPERTY_BDADDR);

system/btif/src/bluetooth.cc

+1 −3

Original line number	Diff line number	Diff line
		@@ -435,9 +435,7 @@ int GetAdapterIndex() { return 0; } // Unsupported outside of FLOSS
		#endif

		static int init(bt_callbacks_t* callbacks, bool start_restricted, bool is_common_criteria_mode,
		int config_compare_result, const char** /* init_flags */, bool is_atv,
		const char* user_data_directory) {
		(void)user_data_directory;
		int config_compare_result, bool is_atv) {
		log::info(
		"start restricted = {} ; common criteria mode = {}, config compare "
		"result = {}",

system/gd/rust/topshim/src/btif.rs

+1 −3

Original line number	Diff line number	Diff line
		@@ -1262,9 +1262,7 @@ impl BluetoothInterface {
		guest_mode,
		is_common_criteria_mode,
		config_compare_result,
		std::ptr::null_mut(),
		is_atv,
		std::ptr::null()
		is_atv
		);

		self.is_init = init == 0;