From b99c5b61ad24040bd13ae4b0bef805f3404f6cbd Mon Sep 17 00:00:00 2001 From: Harpreet Eli Sangha Date: Wed, 7 Apr 2021 12:39:25 +0900 Subject: [PATCH] UWB: Annotate DistanceMeasurement Parameters Bug: 184204591 Test: Build Signed-off-by: Harpreet Eli Sangha Change-Id: Ifabfef88773db111cc119e4376183281f0ef3970 --- core/api/system-current.txt | 6 +++--- core/java/android/uwb/DistanceMeasurement.java | 6 ++++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/core/api/system-current.txt b/core/api/system-current.txt index e6624cdb865a4..bc77d3cbdccd5 100644 --- a/core/api/system-current.txt +++ b/core/api/system-current.txt @@ -12492,7 +12492,7 @@ package android.uwb { public final class DistanceMeasurement implements android.os.Parcelable { method public int describeContents(); method @FloatRange(from=0.0, to=1.0) public double getConfidenceLevel(); - method public double getErrorMeters(); + method @FloatRange(from=0.0) public double getErrorMeters(); method public double getMeters(); method public void writeToParcel(@NonNull android.os.Parcel, int); field @NonNull public static final android.os.Parcelable.Creator CREATOR; @@ -12501,8 +12501,8 @@ package android.uwb { public static final class DistanceMeasurement.Builder { ctor public DistanceMeasurement.Builder(); method @NonNull public android.uwb.DistanceMeasurement build(); - method @NonNull public android.uwb.DistanceMeasurement.Builder setConfidenceLevel(double); - method @NonNull public android.uwb.DistanceMeasurement.Builder setErrorMeters(double); + method @NonNull public android.uwb.DistanceMeasurement.Builder setConfidenceLevel(@FloatRange(from=0.0, to=1.0) double); + method @NonNull public android.uwb.DistanceMeasurement.Builder setErrorMeters(@FloatRange(from=0.0) double); method @NonNull public android.uwb.DistanceMeasurement.Builder setMeters(double); } diff --git a/core/java/android/uwb/DistanceMeasurement.java b/core/java/android/uwb/DistanceMeasurement.java index 2a9bbdf3ec5d7..98565536e64a3 100644 --- a/core/java/android/uwb/DistanceMeasurement.java +++ b/core/java/android/uwb/DistanceMeasurement.java @@ -60,6 +60,7 @@ public final class DistanceMeasurement implements Parcelable { * * @return error of distance measurement in meters */ + @FloatRange(from = 0.0) public double getErrorMeters() { return mErrorMeters; } @@ -162,7 +163,7 @@ public final class DistanceMeasurement implements Parcelable { * @throws IllegalArgumentException if error is negative or NaN */ @NonNull - public Builder setErrorMeters(double errorMeters) { + public Builder setErrorMeters(@FloatRange(from = 0.0) double errorMeters) { if (Double.isNaN(errorMeters) || errorMeters < 0.0) { throw new IllegalArgumentException( "errorMeters must be >= 0.0 and not NaN: " + errorMeters); @@ -178,7 +179,8 @@ public final class DistanceMeasurement implements Parcelable { * @throws IllegalArgumentException if confidence level is not in the range of [0.0, 1.0] */ @NonNull - public Builder setConfidenceLevel(double confidenceLevel) { + public Builder setConfidenceLevel( + @FloatRange(from = 0.0, to = 1.0) double confidenceLevel) { if (confidenceLevel < 0.0 || confidenceLevel > 1.0) { throw new IllegalArgumentException( "confidenceLevel must be in the range [0.0, 1.0]: " + confidenceLevel);