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

Commit b222e3ae authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Remove channel_sounding flag" into main

parents f276b177 f2116e8a

framework/api/system-current.txt

+22 −22
Original line number Diff line number Diff line
@@ -1275,7 +1275,7 @@ package android.bluetooth.le { 
    method @Deprecated @RequiresPermission(android.Manifest.permission.BLUETOOTH_SCAN) public void startTruncatedScan(java.util.List<android.bluetooth.le.TruncatedFilter>, android.bluetooth.le.ScanSettings, android.bluetooth.le.ScanCallback);

  }



  @FlaggedApi("com.android.bluetooth.flags.channel_sounding") public final class ChannelSoundingParams implements android.os.Parcelable {

  public final class ChannelSoundingParams implements android.os.Parcelable {

    method public int describeContents();

    method public int getCsSecurityLevel();

    method public int getLocationType();
@@ -1304,8 +1304,8 @@ package android.bluetooth.le { 
  }



  public final class DistanceMeasurementManager {

    method @FlaggedApi("com.android.bluetooth.flags.channel_sounding") @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public int getChannelSoundingMaxSupportedSecurityLevel(@NonNull android.bluetooth.BluetoothDevice);

    method @FlaggedApi("com.android.bluetooth.flags.channel_sounding") @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public int getLocalChannelSoundingMaxSupportedSecurityLevel();

    method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public int getChannelSoundingMaxSupportedSecurityLevel(@NonNull android.bluetooth.BluetoothDevice);

    method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public int getLocalChannelSoundingMaxSupportedSecurityLevel();

    method @NonNull @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public java.util.List<android.bluetooth.le.DistanceMeasurementMethod> getSupportedMethods();

    method @Nullable @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public android.os.CancellationSignal startMeasurementSession(@NonNull android.bluetooth.le.DistanceMeasurementParams, @NonNull java.util.concurrent.Executor, @NonNull android.bluetooth.le.DistanceMeasurementSession.Callback);

  }
@@ -1319,7 +1319,7 @@ package android.bluetooth.le { 
    method public void writeToParcel(android.os.Parcel, int);

    field @NonNull public static final android.os.Parcelable.Creator<android.bluetooth.le.DistanceMeasurementMethod> CREATOR;

    field public static final int DISTANCE_MEASUREMENT_METHOD_AUTO = 0; // 0x0

    field @FlaggedApi("com.android.bluetooth.flags.channel_sounding") public static final int DISTANCE_MEASUREMENT_METHOD_CHANNEL_SOUNDING = 2; // 0x2

    field public static final int DISTANCE_MEASUREMENT_METHOD_CHANNEL_SOUNDING = 2; // 0x2

    field public static final int DISTANCE_MEASUREMENT_METHOD_RSSI = 1; // 0x1

  }
@@ -1332,7 +1332,7 @@ package android.bluetooth.le { 


  public final class DistanceMeasurementParams implements android.os.Parcelable {

    method public int describeContents();

    method @FlaggedApi("com.android.bluetooth.flags.channel_sounding") @Nullable public android.bluetooth.le.ChannelSoundingParams getChannelSoundingParams();

    method @Nullable public android.bluetooth.le.ChannelSoundingParams getChannelSoundingParams();

    method public static int getDefaultDurationSeconds();

    method @NonNull public android.bluetooth.BluetoothDevice getDevice();

    method @IntRange(from=0) public int getDurationSeconds();
@@ -1349,7 +1349,7 @@ package android.bluetooth.le { 
  public static final class DistanceMeasurementParams.Builder {

    ctor public DistanceMeasurementParams.Builder(@NonNull android.bluetooth.BluetoothDevice);

    method @NonNull public android.bluetooth.le.DistanceMeasurementParams build();

    method @FlaggedApi("com.android.bluetooth.flags.channel_sounding") @NonNull public android.bluetooth.le.DistanceMeasurementParams.Builder setChannelSoundingParams(@NonNull android.bluetooth.le.ChannelSoundingParams);

    method @NonNull public android.bluetooth.le.DistanceMeasurementParams.Builder setChannelSoundingParams(@NonNull android.bluetooth.le.ChannelSoundingParams);

    method @NonNull public android.bluetooth.le.DistanceMeasurementParams.Builder setDurationSeconds(@IntRange(from=0) int);

    method @NonNull public android.bluetooth.le.DistanceMeasurementParams.Builder setFrequency(int);

    method @NonNull public android.bluetooth.le.DistanceMeasurementParams.Builder setMethodId(int);
@@ -1359,25 +1359,25 @@ package android.bluetooth.le { 
    method public int describeContents();

    method @FloatRange(from=-90.0, to=90.0) public double getAltitudeAngle();

    method @FloatRange(from=0.0, to=360.0) public double getAzimuthAngle();

    method @FlaggedApi("com.android.bluetooth.flags.channel_sounding") @FloatRange(from=0.0, to=1.0) public double getConfidenceLevel();

    method @FlaggedApi("com.android.bluetooth.flags.channel_sounding") public double getDelaySpreadMeters();

    method @FlaggedApi("com.android.bluetooth.flags.channel_sounding") public int getDetectedAttackLevel();

    method @FloatRange(from=0.0, to=1.0) public double getConfidenceLevel();

    method public double getDelaySpreadMeters();

    method public int getDetectedAttackLevel();

    method public double getErrorAltitudeAngle();

    method public double getErrorAzimuthAngle();

    method @FloatRange(from=0.0) public double getErrorMeters();

    method @FlaggedApi("com.android.bluetooth.flags.channel_sounding_25q2_apis") public long getMeasurementTimestampNanos();

    method public double getResultMeters();

    method @FlaggedApi("com.android.bluetooth.flags.channel_sounding") public double getVelocityMetersPerSecond();

    method public double getVelocityMetersPerSecond();

    method public void writeToParcel(android.os.Parcel, int);

    field @NonNull public static final android.os.Parcelable.Creator<android.bluetooth.le.DistanceMeasurementResult> CREATOR;

    field @FlaggedApi("com.android.bluetooth.flags.channel_sounding") public static final int NADM_ATTACK_IS_EXTREMELY_LIKELY = 6; // 0x6

    field @FlaggedApi("com.android.bluetooth.flags.channel_sounding") public static final int NADM_ATTACK_IS_EXTREMELY_UNLIKELY = 0; // 0x0

    field @FlaggedApi("com.android.bluetooth.flags.channel_sounding") public static final int NADM_ATTACK_IS_LIKELY = 4; // 0x4

    field @FlaggedApi("com.android.bluetooth.flags.channel_sounding") public static final int NADM_ATTACK_IS_POSSIBLE = 3; // 0x3

    field @FlaggedApi("com.android.bluetooth.flags.channel_sounding") public static final int NADM_ATTACK_IS_UNLIKELY = 2; // 0x2

    field @FlaggedApi("com.android.bluetooth.flags.channel_sounding") public static final int NADM_ATTACK_IS_VERY_LIKELY = 5; // 0x5

    field @FlaggedApi("com.android.bluetooth.flags.channel_sounding") public static final int NADM_ATTACK_IS_VERY_UNLIKELY = 1; // 0x1

    field @FlaggedApi("com.android.bluetooth.flags.channel_sounding") public static final int NADM_UNKNOWN = 255; // 0xff

    field public static final int NADM_ATTACK_IS_EXTREMELY_LIKELY = 6; // 0x6

    field public static final int NADM_ATTACK_IS_EXTREMELY_UNLIKELY = 0; // 0x0

    field public static final int NADM_ATTACK_IS_LIKELY = 4; // 0x4

    field public static final int NADM_ATTACK_IS_POSSIBLE = 3; // 0x3

    field public static final int NADM_ATTACK_IS_UNLIKELY = 2; // 0x2

    field public static final int NADM_ATTACK_IS_VERY_LIKELY = 5; // 0x5

    field public static final int NADM_ATTACK_IS_VERY_UNLIKELY = 1; // 0x1

    field public static final int NADM_UNKNOWN = 255; // 0xff

  }



  public static final class DistanceMeasurementResult.Builder {
@@ -1385,13 +1385,13 @@ package android.bluetooth.le { 
    method @NonNull public android.bluetooth.le.DistanceMeasurementResult build();

    method @NonNull public android.bluetooth.le.DistanceMeasurementResult.Builder setAltitudeAngle(@FloatRange(from=-90.0, to=90.0) double);

    method @NonNull public android.bluetooth.le.DistanceMeasurementResult.Builder setAzimuthAngle(@FloatRange(from=0.0, to=360.0) double);

    method @FlaggedApi("com.android.bluetooth.flags.channel_sounding") @NonNull public android.bluetooth.le.DistanceMeasurementResult.Builder setConfidenceLevel(@FloatRange(from=0.0, to=1.0) double);

    method @FlaggedApi("com.android.bluetooth.flags.channel_sounding") @NonNull public android.bluetooth.le.DistanceMeasurementResult.Builder setDelaySpreadMeters(double);

    method @FlaggedApi("com.android.bluetooth.flags.channel_sounding") @NonNull public android.bluetooth.le.DistanceMeasurementResult.Builder setDetectedAttackLevel(int);

    method @NonNull public android.bluetooth.le.DistanceMeasurementResult.Builder setConfidenceLevel(@FloatRange(from=0.0, to=1.0) double);

    method @NonNull public android.bluetooth.le.DistanceMeasurementResult.Builder setDelaySpreadMeters(double);

    method @NonNull public android.bluetooth.le.DistanceMeasurementResult.Builder setDetectedAttackLevel(int);

    method @NonNull public android.bluetooth.le.DistanceMeasurementResult.Builder setErrorAltitudeAngle(@FloatRange(from=0.0, to=180.0) double);

    method @NonNull public android.bluetooth.le.DistanceMeasurementResult.Builder setErrorAzimuthAngle(@FloatRange(from=0.0, to=360.0) double);

    method @FlaggedApi("com.android.bluetooth.flags.channel_sounding_25q2_apis") @NonNull public android.bluetooth.le.DistanceMeasurementResult.Builder setMeasurementTimestampNanos(long);

    method @FlaggedApi("com.android.bluetooth.flags.channel_sounding") @NonNull public android.bluetooth.le.DistanceMeasurementResult.Builder setVelocityMetersPerSecond(double);

    method @NonNull public android.bluetooth.le.DistanceMeasurementResult.Builder setVelocityMetersPerSecond(double);

  }



  public final class DistanceMeasurementSession {

framework/java/android/bluetooth/le/ChannelSoundingParams.java

+0 −4
Original line number Diff line number Diff line
@@ -16,15 +16,12 @@ 


package android.bluetooth.le;



import android.annotation.FlaggedApi;

import android.annotation.IntDef;

import android.annotation.NonNull;

import android.annotation.SystemApi;

import android.os.Parcel;

import android.os.Parcelable;



import com.android.bluetooth.flags.Flags;



import java.lang.annotation.Retention;

import java.lang.annotation.RetentionPolicy;
@@ -35,7 +32,6 @@ import java.lang.annotation.RetentionPolicy; 
 *

 * @hide

 */

@FlaggedApi(Flags.FLAG_CHANNEL_SOUNDING)

@SystemApi

public final class ChannelSoundingParams implements Parcelable {

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

+0 −5
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ package android.bluetooth.le; 
import static android.Manifest.permission.BLUETOOTH_CONNECT;

import static android.Manifest.permission.BLUETOOTH_PRIVILEGED;



import android.annotation.FlaggedApi;

import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.RequiresPermission;
@@ -36,8 +35,6 @@ import android.os.ParcelUuid; 
import android.os.RemoteException;

import android.util.Log;



import com.android.bluetooth.flags.Flags;



import java.util.ArrayList;

import java.util.List;

import java.util.Objects;
@@ -169,7 +166,6 @@ public final class DistanceMeasurementManager { 
     *     when Channel Sounding is not supported or encounters an internal error.

     * @hide

     */

    @FlaggedApi(Flags.FLAG_CHANNEL_SOUNDING)

    @SystemApi

    @RequiresBluetoothConnectPermission

    @RequiresPermission(allOf = {BLUETOOTH_CONNECT, BLUETOOTH_PRIVILEGED})
@@ -200,7 +196,6 @@ public final class DistanceMeasurementManager { 
     *     when Channel Sounding is not supported or encounters an internal error.

     * @hide

     */

    @FlaggedApi(Flags.FLAG_CHANNEL_SOUNDING)

    @SystemApi

    @RequiresBluetoothConnectPermission

    @RequiresPermission(allOf = {BLUETOOTH_CONNECT, BLUETOOTH_PRIVILEGED})

framework/java/android/bluetooth/le/DistanceMeasurementMethod.java

+0 −1
Original line number Diff line number Diff line
@@ -73,7 +73,6 @@ public final class DistanceMeasurementMethod implements Parcelable { 
     *

     * @hide

     */

    @FlaggedApi(Flags.FLAG_CHANNEL_SOUNDING)

    @SystemApi

    public static final int DISTANCE_MEASUREMENT_METHOD_CHANNEL_SOUNDING = 2;

framework/java/android/bluetooth/le/DistanceMeasurementParams.java

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


package android.bluetooth.le;



import android.annotation.FlaggedApi;

import android.annotation.IntDef;

import android.annotation.IntRange;

import android.annotation.NonNull;
@@ -27,8 +26,6 @@ import android.bluetooth.le.DistanceMeasurementMethod.DistanceMeasurementMethodI 
import android.os.Parcel;

import android.os.Parcelable;



import com.android.bluetooth.flags.Flags;



import java.lang.annotation.Retention;

import java.lang.annotation.RetentionPolicy;

import java.util.Objects;
@@ -143,7 +140,6 @@ public final class DistanceMeasurementParams implements Parcelable { 
     *

     * @hide

     */

    @FlaggedApi(Flags.FLAG_CHANNEL_SOUNDING)

    @SystemApi

    public @Nullable ChannelSoundingParams getChannelSoundingParams() {

        return mChannelSoundingParams;
@@ -312,7 +308,6 @@ public final class DistanceMeasurementParams implements Parcelable { 
         * @return the same Builder instance

         * @hide

         */

        @FlaggedApi(Flags.FLAG_CHANNEL_SOUNDING)

        @SystemApi

        public @NonNull Builder setChannelSoundingParams(

                @NonNull ChannelSoundingParams channelSoundingParams) {