diff --git a/bluetooth/ranging/aidl/aidl_api/android.hardware.bluetooth.ranging/current/android/hardware/bluetooth/ranging/ChannelSoudingRawData.aidl b/bluetooth/ranging/aidl/aidl_api/android.hardware.bluetooth.ranging/current/android/hardware/bluetooth/ranging/ChannelSoudingRawData.aidl index e7fad4d01b..8fc77aec31 100644 --- a/bluetooth/ranging/aidl/aidl_api/android.hardware.bluetooth.ranging/current/android/hardware/bluetooth/ranging/ChannelSoudingRawData.aidl +++ b/bluetooth/ranging/aidl/aidl_api/android.hardware.bluetooth.ranging/current/android/hardware/bluetooth/ranging/ChannelSoudingRawData.aidl @@ -35,6 +35,7 @@ package android.hardware.bluetooth.ranging; @VintfStability parcelable ChannelSoudingRawData { int procedureCounter; + int[] frequencyCompensation; boolean aborted; android.hardware.bluetooth.ranging.ChannelSoundingSingleSideData initiatorData; android.hardware.bluetooth.ranging.ChannelSoundingSingleSideData reflectorData; diff --git a/bluetooth/ranging/aidl/aidl_api/android.hardware.bluetooth.ranging/current/android/hardware/bluetooth/ranging/ChannelSoundingSingleSideData.aidl b/bluetooth/ranging/aidl/aidl_api/android.hardware.bluetooth.ranging/current/android/hardware/bluetooth/ranging/ChannelSoundingSingleSideData.aidl index 9fe85da874..ddaba720f7 100644 --- a/bluetooth/ranging/aidl/aidl_api/android.hardware.bluetooth.ranging/current/android/hardware/bluetooth/ranging/ChannelSoundingSingleSideData.aidl +++ b/bluetooth/ranging/aidl/aidl_api/android.hardware.bluetooth.ranging/current/android/hardware/bluetooth/ranging/ChannelSoundingSingleSideData.aidl @@ -38,6 +38,7 @@ parcelable ChannelSoundingSingleSideData { @nullable byte[] packetQuality; @nullable byte[] packetRssiDbm; @nullable android.hardware.bluetooth.ranging.Nadm[] packetNadm; + @nullable int[] measuredFreqOffset; @nullable List packetPct1; @nullable List packetPct2; byte referencePowerDbm; diff --git a/bluetooth/ranging/aidl/aidl_api/android.hardware.bluetooth.ranging/current/android/hardware/bluetooth/ranging/StepTonePct.aidl b/bluetooth/ranging/aidl/aidl_api/android.hardware.bluetooth.ranging/current/android/hardware/bluetooth/ranging/StepTonePct.aidl index a51ba3790a..412574856e 100644 --- a/bluetooth/ranging/aidl/aidl_api/android.hardware.bluetooth.ranging/current/android/hardware/bluetooth/ranging/StepTonePct.aidl +++ b/bluetooth/ranging/aidl/aidl_api/android.hardware.bluetooth.ranging/current/android/hardware/bluetooth/ranging/StepTonePct.aidl @@ -36,6 +36,7 @@ package android.hardware.bluetooth.ranging; parcelable StepTonePct { List tonePcts; byte[] toneQualityIndicator; + byte toneExtensionAntennaIndex; const int TONE_QUALITY_GOOD = 0; const int TONE_QUALITY_MEDIUM = 1; const int TONE_QUALITY_LOW = 2; @@ -44,4 +45,9 @@ parcelable StepTonePct { const int EXTENSION_SLOT_TONE_NOT_EXPECTED_TO_BE_PRESENT = 1; const int EXTENSION_SLOT_TONE_EXPECTED_TO_BE_PRESENT = 2; const int EXTENSION_SLOT_SHIFT_AMOUNT = 4; + const byte TONE_EXTENSION_ANTENNA_1 = 0x0; + const byte TONE_EXTENSION_ANTENNA_2 = 0x1; + const byte TONE_EXTENSION_ANTENNA_3 = 0x2; + const byte TONE_EXTENSION_ANTENNA_4 = 0x3; + const byte TONE_EXTENSION_UNUSED = 0xFFu8; } diff --git a/bluetooth/ranging/aidl/android/hardware/bluetooth/ranging/ChannelSoudingRawData.aidl b/bluetooth/ranging/aidl/android/hardware/bluetooth/ranging/ChannelSoudingRawData.aidl index 3c8a62fc25..0106865b97 100644 --- a/bluetooth/ranging/aidl/android/hardware/bluetooth/ranging/ChannelSoudingRawData.aidl +++ b/bluetooth/ranging/aidl/android/hardware/bluetooth/ranging/ChannelSoudingRawData.aidl @@ -28,6 +28,11 @@ parcelable ChannelSoudingRawData { * Procedure counter of the CS procedure. */ int procedureCounter; + /** + * Frequency Compensation indicates fractional frequency + * offset (FFO) value of initiator, in 0.01ppm + */ + int[] frequencyCompensation; /** * Indicate if the procedure aborted. */ diff --git a/bluetooth/ranging/aidl/android/hardware/bluetooth/ranging/ChannelSoundingSingleSideData.aidl b/bluetooth/ranging/aidl/android/hardware/bluetooth/ranging/ChannelSoundingSingleSideData.aidl index 2c3f20152d..942fc0d35e 100644 --- a/bluetooth/ranging/aidl/android/hardware/bluetooth/ranging/ChannelSoundingSingleSideData.aidl +++ b/bluetooth/ranging/aidl/android/hardware/bluetooth/ranging/ChannelSoundingSingleSideData.aidl @@ -41,6 +41,10 @@ parcelable ChannelSoundingSingleSideData { * Packet NADM of mode-1 or mode-3 step data for attack detection. */ @nullable Nadm[] packetNadm; + /** + * Measured Frequency Offset from mode 0, relative to the remote device, in 0.01ppm + */ + @nullable int[] measuredFreqOffset; /** * Packet_PCT1 or packet_PCT2 of mode-1 or mode-3, if sounding sequence is used and sounding * phase-based ranging is supported. diff --git a/bluetooth/ranging/aidl/android/hardware/bluetooth/ranging/StepTonePct.aidl b/bluetooth/ranging/aidl/android/hardware/bluetooth/ranging/StepTonePct.aidl index 99c6d65e68..46508614ee 100644 --- a/bluetooth/ranging/aidl/android/hardware/bluetooth/ranging/StepTonePct.aidl +++ b/bluetooth/ranging/aidl/android/hardware/bluetooth/ranging/StepTonePct.aidl @@ -23,6 +23,10 @@ import android.hardware.bluetooth.ranging.ComplexNumber; */ @VintfStability parcelable StepTonePct { + /** + * PCT measured from mode-2 or mode-3 steps + * (in ascending order of antenna position with tone extension data at the end). + */ List tonePcts; const int TONE_QUALITY_GOOD = 0; const int TONE_QUALITY_MEDIUM = 1; @@ -52,4 +56,20 @@ parcelable StepTonePct { * See: https://bluetooth.com/specifications/specs/channel-sounding-cr-pr/ */ byte[] toneQualityIndicator; + + const byte TONE_EXTENSION_ANTENNA_1 = 0x0; + const byte TONE_EXTENSION_ANTENNA_2 = 0x1; + const byte TONE_EXTENSION_ANTENNA_3 = 0x2; + const byte TONE_EXTENSION_ANTENNA_4 = 0x3; + const byte TONE_EXTENSION_UNUSED = 0xFFu8; + /** + * Tone Extension Antenna Index indicates the Antenna position used in tone extension slot + * + * 0x00 = A1 + * 0x01 = A2 + * 0x02 = A3 + * 0x03 = A4 + * 0xFF = Tone extension not used + */ + byte toneExtensionAntennaIndex; }