Snap for 12052458 from 83434e3d564829121c4558abd8da9f5cb20ada02 to 24Q4-release (8d1e8ad2) · Commits · e / os / android_packages_modules_Bluetooth

android/app/src/com/android/bluetooth/le_scan/TransitionalScanHelper.java

+3 −2

Original line number	Diff line number	Diff line
		@@ -1016,13 +1016,14 @@ public class TransitionalScanHelper {
		}
		}

		public void onScanParamSetupCompleted(int status, int scannerId) throws RemoteException {
		/** Callback method for configuration of scan parameters. */
		public void onScanParamSetupCompleted(int status, int scannerId) {
		Log.d(TAG, "onScanParamSetupCompleted() - scannerId=" + scannerId + ", status=" + status);
		ScannerMap.ScannerApp app = mScannerMap.getById(scannerId);
		if (app == null \|\| app.mCallback == null) {
		Log.e(TAG, "Advertise app or callback is null");
		return;
		}
		Log.d(TAG, "onScanParamSetupCompleted : " + status);
		}

		// callback from ScanManager for dispatch of errors apps.

+14 −4

Original line number	Diff line number	Diff line
		@@ -94,10 +94,20 @@ public final class BluetoothCodecType implements Parcelable {
		}

		/**
		* Returns the codec unique identifier. The codec identifier is 40 bits, - Bits 0-7: Audio Codec
		* ID, as defined by [ID 6.5.1] 0x00: SBC 0x02: AAC 0xFF: Vendor - Bits 8-23: Company ID, set to
		* 0, if octet 0 is not 0xFF. - Bits 24-39: Vendor-defined codec ID, set to 0, if octet 0 is not
		* 0xFF.
		* Returns the codec unique identifier.
		*
		* <p>The codec identifier is 40 bits:
		*
		* <ul>
		* <li>Bits 0-7: Audio Codec ID, as defined by [ID 6.5.1]
		* <ul>
		* <li>0x00: SBC
		* <li>0x02: AAC
		* <li>0xFF: Vendor
		* </ul>
		* <li>Bits 8-23: Company ID, set to 0, if octet 0 is not 0xFF.
		* <li>Bits 24-39: Vendor-defined codec ID, set to 0, if octet 0 is not 0xFF.
		* </ul>
		*/
		@FlaggedApi(Flags.FLAG_A2DP_OFFLOAD_CODEC_EXTENSIBILITY)
		public long getCodecId() {

+0 −3

Original line number	Diff line number	Diff line
		@@ -22,6 +22,3 @@
		#include <bta.sysprop.h>
		#include <device_id.sysprop.h>
		#include <hfp.sysprop.h>

		#define GET_SYSPROP(namespace, prop, default) \
		android::sysprop::bluetooth::namespace ::prop().value_or(default)

+7 −9

Original line number	Diff line number	Diff line
		@@ -29,16 +29,14 @@ namespace bluetooth {
		namespace audio {
		namespace a2dp {

		/// Copied after the definition from the Bluetooth Audio interface:
		/// Loosely copied after the definition from the Bluetooth Audio interface:
		/// hardware/interfaces/bluetooth/audio/aidl/android/hardware/bluetooth/audio/BluetoothAudioStatus.aidl
		enum BluetoothAudioStatus {
		UNKNOWN = 0,
		SUCCESS = 1,
		UNSUPPORTED_CODEC_CONFIGURATION = 2,
		FAILURE = 3,
		// Not defined in BluetoothAudioStatus, but used internally for
		// state keeping.
		PENDING = 5,
		enum class BluetoothAudioStatus {
		SUCCESS = 0,
		UNKNOWN,
		UNSUPPORTED_CODEC_CONFIGURATION,
		FAILURE,
		PENDING,
		};

		bool update_codec_offloading_capabilities(

+1 −1

Original line number	Diff line number	Diff line
		@@ -31,7 +31,7 @@ using namespace bluetooth;

		bool is_hfp_aptx_voice_enabled() {
		return com::android::bluetooth::flags::hfp_codec_aptx_voice() &&
		GET_SYSPROP(Hfp, codec_aptx_voice, false);
		android::sysprop::bluetooth::Hfp::codec_aptx_voice().value_or(false);
		}

		static bool aptx_swb_codec_status;