Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b47451ec authored by Steven Liu's avatar Steven Liu
Browse files

Update the CS API doc according to the feedback. 

Flag: com.android.bluetooth.flags.channel_sounding_25q2_apis
Bug: 367409858
Bug: 383400759
Test: m com.android.btservices
Change-Id: I68cf377db516f06cb22bfb69a0fda8115a85180e
parent cdc27a6c

framework/java/android/bluetooth/le/DistanceMeasurementManager.java

+6 −3
Original line number Diff line number Diff line
@@ -166,7 +166,8 @@ public final class DistanceMeasurementManager { 
     * Get the maximum supported security level of channel sounding between the local device and a

     * specific remote device.

     *

     * <p>See: https://bluetooth.com/specifications/specs/channel-sounding-cr-pr/

     * <p>See: Vol 3 Part C, Chapter 10.11.1 of

     * https://bluetooth.com/specifications/specs/core60-html/

     *

     * @param remoteDevice remote device of channel sounding

     * @return max supported security level, {@link ChannelSoundingParams#CS_SECURITY_LEVEL_UNKNOWN}
@@ -200,7 +201,8 @@ public final class DistanceMeasurementManager { 
    /**

     * Get the maximum supported security level of channel sounding of the local device.

     *

     * <p>See: https://bluetooth.com/specifications/specs/channel-sounding-cr-pr/

     * <p>See: Vol 3 Part C, Chapter 10.11.1 of

     * https://bluetooth.com/specifications/specs/core60-html/

     *

     * @return max supported security level, {@link ChannelSoundingParams#CS_SECURITY_LEVEL_UNKNOWN}

     *     when Channel Sounding is not supported or encounters an internal error.
@@ -230,7 +232,8 @@ public final class DistanceMeasurementManager { 
    /**

     * Get the set of supported security levels of channel sounding.

     *

     * <p>See: https://bluetooth.com/specifications/specs/core60-html/

     * <p>See: Vol 3 Part C, Chapter 10.11.1 of

     * https://bluetooth.com/specifications/specs/core60-html/

     *

     * @return the set of supported security levels, empty when encounters an internal error.

     * @throws UnsupportedOperationException if the {@link

framework/java/android/bluetooth/le/DistanceMeasurementResult.java

+5 −7
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 


package android.bluetooth.le;



import android.annotation.ElapsedRealtimeLong;

import android.annotation.FlaggedApi;

import android.annotation.FloatRange;

import android.annotation.IntDef;
@@ -133,7 +132,7 @@ public final class DistanceMeasurementResult implements Parcelable { 
    private final double mConfidenceLevel;

    private final int mDetectedAttackLevel;

    private final double mVelocityMetersPerSecond;

    private final @ElapsedRealtimeLong long mMeasurementTimestampNanos;

    private final long mMeasurementTimestampNanos;



    private DistanceMeasurementResult(

            double meters,
@@ -146,7 +145,7 @@ public final class DistanceMeasurementResult implements Parcelable { 
            double confidenceLevel,

            @Nadm int detectedAttackLevel,

            double velocityMetersPerSecond,

            @ElapsedRealtimeLong long measurementTimestampNanos) {

            long measurementTimestampNanos) {

        mMeters = meters;

        mErrorMeters = errorMeters;

        mAzimuthAngle = azimuthAngle;
@@ -313,7 +312,7 @@ public final class DistanceMeasurementResult implements Parcelable { 
     */

    @FlaggedApi(Flags.FLAG_CHANNEL_SOUNDING_25Q2_APIS)

    @SystemApi

    public @ElapsedRealtimeLong long getMeasurementTimestampNanos() {

    public long getMeasurementTimestampNanos() {

        return mMeasurementTimestampNanos;

    }
@@ -419,7 +418,7 @@ public final class DistanceMeasurementResult implements Parcelable { 
        private double mConfidenceLevel = Double.NaN;

        private int mDetectedAttackLevel = NADM_UNKNOWN;

        private double mVelocityMetersPerSecond = Double.NaN;

        private @ElapsedRealtimeLong long mMeasurementTimestampNanos = -1L;

        private long mMeasurementTimestampNanos = -1L;



        /**

         * Constructor of the Builder.
@@ -602,8 +601,7 @@ public final class DistanceMeasurementResult implements Parcelable { 
        @FlaggedApi(Flags.FLAG_CHANNEL_SOUNDING_25Q2_APIS)

        @SystemApi

        @NonNull

        public Builder setMeasurementTimestampNanos(

                @ElapsedRealtimeLong long measurementTimestampNanos) {

        public Builder setMeasurementTimestampNanos(long measurementTimestampNanos) {

            mMeasurementTimestampNanos = measurementTimestampNanos;

            return this;

        }