Snap for 7266202 from 538e0829930b6391aeaddb0c11810263cef063d3 to sc-release (b92b268b) · Commits · e / os / android_packages_modules_Bluetooth

system/binder/Android.bp

+4 −0

Original line number	Diff line number	Diff line
		@@ -28,6 +28,7 @@ cc_library_shared {
		"android/bluetooth/IBluetoothProfileServiceConnection.aidl",
		"android/bluetooth/IBluetoothHeadset.aidl",
		"android/bluetooth/IBluetoothHearingAid.aidl",
		"android/bluetooth/IBluetoothVolumeControl.aidl",
		"android/bluetooth/IBluetoothHidHost.aidl",
		"android/bluetooth/IBluetoothPan.aidl",
		"android/bluetooth/IBluetoothManager.aidl",
		@@ -45,6 +46,7 @@ cc_library_shared {
		"android/bluetooth/IBluetoothGattCallback.aidl",
		"android/bluetooth/IBluetoothMetadataListener.aidl",
		"android/bluetooth/IBluetoothGattServerCallback.aidl",
		"android/bluetooth/IBluetoothOobDataCallback.aidl",
		"android/bluetooth/le/IAdvertisingSetCallback.aidl",
		"android/bluetooth/le/IPeriodicAdvertisingCallback.aidl",
		"android/bluetooth/le/IScannerCallback.aidl"
		@@ -102,6 +104,7 @@ filegroup {
		"android/bluetooth/IBluetoothProfileServiceConnection.aidl",
		"android/bluetooth/IBluetoothHeadset.aidl",
		"android/bluetooth/IBluetoothHearingAid.aidl",
		"android/bluetooth/IBluetoothVolumeControl.aidl",
		"android/bluetooth/IBluetoothHidHost.aidl",
		"android/bluetooth/IBluetoothLeAudio.aidl",
		"android/bluetooth/IBluetoothPan.aidl",
		@@ -121,6 +124,7 @@ filegroup {
		"android/bluetooth/IBluetoothGattCallback.aidl",
		"android/bluetooth/IBluetoothMetadataListener.aidl",
		"android/bluetooth/IBluetoothGattServerCallback.aidl",
		"android/bluetooth/IBluetoothOobDataCallback.aidl",
		"android/bluetooth/le/IAdvertisingSetCallback.aidl",
		"android/bluetooth/le/IPeriodicAdvertisingCallback.aidl",
		"android/bluetooth/le/IScannerCallback.aidl",

system/binder/android/bluetooth/IBluetooth.aidl

+2 −0

Original line number	Diff line number	Diff line
		@@ -19,6 +19,7 @@ package android.bluetooth;
		import android.bluetooth.IBluetoothCallback;
		import android.bluetooth.IBluetoothConnectionCallback;
		import android.bluetooth.IBluetoothMetadataListener;
		import android.bluetooth.IBluetoothOobDataCallback;
		import android.bluetooth.IBluetoothSocketManager;
		import android.bluetooth.IBluetoothStateChangeCallback;
		import android.bluetooth.BluetoothActivityEnergyInfo;
		@@ -154,4 +155,5 @@ interface IBluetooth
		boolean unregisterBluetoothConnectionCallback(in IBluetoothConnectionCallback callback);

		boolean canBondWithoutDialog(in BluetoothDevice device);
		void generateLocalOobData(in int transport, IBluetoothOobDataCallback callback);
		}

system/binder/android/bluetooth/IBluetoothOobDataCallback.aidl

0 → 100644

+30 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright 2021 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package android.bluetooth;

		import android.bluetooth.IBluetooth;
		import android.bluetooth.OobData;

		/**
		* API for receiving OobData from the host stack
		*
		* {@hide}
		*/
		oneway interface IBluetoothOobDataCallback {
		void onOobData(int transport, in OobData oobData);
		void onError(int errorCode);
		}

system/binder/android/bluetooth/IBluetoothVolumeControl.aidl

0 → 100644

+39 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright 2021 HIMSA II K/S - www.himsa.com.
		* Represented by EHIMA - www.ehima.com
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package android.bluetooth;

		import android.bluetooth.BluetoothDevice;

		/**
		* APIs for Bluetooth Volume Control service
		*
		* @hide
		*/
		interface IBluetoothVolumeControl {
		/* Public API */
		boolean connect(in BluetoothDevice device);
		boolean disconnect(in BluetoothDevice device);
		List<BluetoothDevice> getConnectedDevices();
		List<BluetoothDevice> getDevicesMatchingConnectionStates(in int[] states);
		int getConnectionState(in BluetoothDevice device);
		boolean setConnectionPolicy(in BluetoothDevice device, int connectionPolicy);
		int getConnectionPolicy(in BluetoothDevice device);

		void setVolume(in BluetoothDevice device, int volume);
		void setVolumeGroup(int group_id, int volume);
		}

system/bta/Android.bp

+45 −0

Original line number	Diff line number	Diff line
		@@ -80,6 +80,8 @@ cc_library_static {
		"gatt/bta_gatts_utils.cc",
		"gatt/database.cc",
		"gatt/database_builder.cc",
		"vc/device.cc",
		"vc/vc.cc",
		"hearing_aid/hearing_aid.cc",
		"hearing_aid/hearing_aid_audio_source.cc",
		"hf_client/bta_hf_client_act.cc",
		@@ -255,3 +257,46 @@ cc_test {
		],
		cflags: ["-DBUILDCFG"],
		}


		// bta unit tests for host
		// ========================================================
		cc_test {
		name: "bluetooth_vc_test",
		test_suites: ["device-tests"],
		defaults: [
		"fluoride_bta_defaults",
		"clang_coverage_bin",
		],
		host_supported: true,
		include_dirs: [
		"packages/modules/Bluetooth/system",
		"packages/modules/Bluetooth/system/bta/include",
		"packages/modules/Bluetooth/system/bta/test/common",
		"packages/modules/Bluetooth/system/stack/include",
		],
		srcs : [
		"gatt/database.cc",
		"gatt/database_builder.cc",
		"test/common/bta_gatt_api_mock.cc",
		"test/common/bta_gatt_queue_mock.cc",
		"test/common/btm_api_mock.cc",
		"vc/devices_test.cc",
		"vc/device.cc",
		"vc/vc.cc",
		"vc/vc_test.cc",
		],
		shared_libs: [
		"libprotobuf-cpp-lite",
		"libcrypto",
		],
		static_libs : [
		"crypto_toolbox_for_tests",
		"libgmock",
		"libbt-common",
		"libbt-protos-lite",
		],
		sanitize: {
		cfi: false,
		},
		}