Merge changes I732f0e78,I7a8f668c,I1f439621,I55122a7b,I83c43497, ... am: d318d93dd5 (bad1cba5) · Commits · e / os / android_frameworks_base

core/java/android/uwb/AngleMeasurement.java

+87 −3

Original line number	Diff line number	Diff line
		@@ -27,6 +27,16 @@ import android.annotation.FloatRange;
		* @hide
		*/
		public final class AngleMeasurement {
		private final double mRadians;
		private final double mErrorRadians;
		private final double mConfidenceLevel;

		private AngleMeasurement(double radians, double errorRadians, double confidenceLevel) {
		mRadians = radians;
		mErrorRadians = errorRadians;
		mConfidenceLevel = confidenceLevel;
		}

		/**
		* Angle measurement in radians
		*
		@@ -34,7 +44,7 @@ public final class AngleMeasurement {
		*/
		@FloatRange(from = -Math.PI, to = +Math.PI)
		public double getRadians() {
		throw new UnsupportedOperationException();
		return mRadians;
		}

		/**
		@@ -46,7 +56,7 @@ public final class AngleMeasurement {
		*/
		@FloatRange(from = 0.0, to = +Math.PI)
		public double getErrorRadians() {
		throw new UnsupportedOperationException();
		return mErrorRadians;
		}

		/**
		@@ -60,6 +70,80 @@ public final class AngleMeasurement {
		*/
		@FloatRange(from = 0.0, to = 1.0)
		public double getConfidenceLevel() {
		throw new UnsupportedOperationException();
		return mConfidenceLevel;
		}

		/**
		* Builder class for {@link AngleMeasurement}.
		*/
		public static final class Builder {
		private double mRadians = Double.NaN;
		private double mErrorRadians = Double.NaN;
		private double mConfidenceLevel = Double.NaN;

		/**
		* Set the angle in radians
		*
		* @param radians angle in radians
		* @throws IllegalArgumentException if angle exceeds allowed limits of [-Math.PI, +Math.PI]
		*/
		public Builder setRadians(double radians) {
		if (radians < -Math.PI \|\| radians > Math.PI) {
		throw new IllegalArgumentException("Invalid radians: " + radians);
		}
		mRadians = radians;
		return this;
		}

		/**
		* Set the angle error in radians
		*
		* @param errorRadians error of the angle in radians
		* @throws IllegalArgumentException if the error exceeds the allowed limits of [0, +Math.PI]
		*/
		public Builder setErrorRadians(double errorRadians) {
		if (errorRadians < 0.0 \|\| errorRadians > Math.PI) {
		throw new IllegalArgumentException(
		"Invalid error radians: " + errorRadians);
		}
		mErrorRadians = errorRadians;
		return this;
		}

		/**
		* Set the angle confidence level
		*
		* @param confidenceLevel level of confidence of the angle measurement
		* @throws IllegalArgumentException if the error exceeds the allowed limits of [0.0, 1.0]
		*/
		public Builder setConfidenceLevel(double confidenceLevel) {
		if (confidenceLevel < 0.0 \|\| confidenceLevel > 1.0) {
		throw new IllegalArgumentException(
		"Invalid confidence level: " + confidenceLevel);
		}
		mConfidenceLevel = confidenceLevel;
		return this;
		}

		/**
		* Build the {@link AngleMeasurement} object
		*
		* @throws IllegalStateException if angle, error, or confidence values are missing
		*/
		public AngleMeasurement build() {
		if (Double.isNaN(mRadians)) {
		throw new IllegalStateException("Angle is not set");
		}

		if (Double.isNaN(mErrorRadians)) {
		throw new IllegalStateException("Angle error is not set");
		}

		if (Double.isNaN(mConfidenceLevel)) {
		throw new IllegalStateException("Angle confidence level is not set");
		}

		return new AngleMeasurement(mRadians, mErrorRadians, mConfidenceLevel);
		}
		}
		}

core/java/android/uwb/AngleOfArrivalMeasurement.java

+53 −2

Original line number	Diff line number	Diff line
		@@ -25,6 +25,15 @@ import android.annotation.Nullable;
		* @hide
		*/
		public final class AngleOfArrivalMeasurement {
		private final AngleMeasurement mAzimuthAngleMeasurement;
		private final AngleMeasurement mAltitudeAngleMeasurement;

		private AngleOfArrivalMeasurement(@NonNull AngleMeasurement azimuthAngleMeasurement,
		@Nullable AngleMeasurement altitudeAngleMeasurement) {
		mAzimuthAngleMeasurement = azimuthAngleMeasurement;
		mAltitudeAngleMeasurement = altitudeAngleMeasurement;
		}

		/**
		* Azimuth angle measurement
		* <p>Azimuth {@link AngleMeasurement} of remote device in horizontal coordinate system, this is
		@@ -41,7 +50,7 @@ public final class AngleOfArrivalMeasurement {
		*/
		@NonNull
		public AngleMeasurement getAzimuth() {
		throw new UnsupportedOperationException();
		return mAzimuthAngleMeasurement;
		}

		/**
		@@ -58,6 +67,48 @@ public final class AngleOfArrivalMeasurement {
		*/
		@Nullable
		public AngleMeasurement getAltitude() {
		throw new UnsupportedOperationException();
		return mAltitudeAngleMeasurement;
		}

		/**
		* Builder class for {@link AngleOfArrivalMeasurement}.
		*/
		public static final class Builder {
		private AngleMeasurement mAzimuthAngleMeasurement = null;
		private AngleMeasurement mAltitudeAngleMeasurement = null;

		/**
		* Set the azimuth angle
		*
		* @param azimuthAngle azimuth angle
		*/
		public Builder setAzimuthAngleMeasurement(@NonNull AngleMeasurement azimuthAngle) {
		mAzimuthAngleMeasurement = azimuthAngle;
		return this;
		}

		/**
		* Set the altitude angle
		*
		* @param altitudeAngle altitude angle
		*/
		public Builder setAltitudeAngleMeasurement(@NonNull AngleMeasurement altitudeAngle) {
		mAltitudeAngleMeasurement = altitudeAngle;
		return this;
		}

		/**
		* Build the {@link AngleOfArrivalMeasurement} object
		*
		* @throws IllegalStateException if the required azimuth angle is not provided
		*/
		public AngleOfArrivalMeasurement build() {
		if (mAzimuthAngleMeasurement == null) {
		throw new IllegalStateException("Azimuth angle measurement is not set");
		}

		return new AngleOfArrivalMeasurement(mAzimuthAngleMeasurement,
		mAltitudeAngleMeasurement);
		}
		}
		}

core/java/android/uwb/DistanceMeasurement.java

+87 −3

Original line number	Diff line number	Diff line
		@@ -27,13 +27,23 @@ import android.annotation.FloatRange;
		* @hide
		*/
		public final class DistanceMeasurement {
		private final double mMeters;
		private final double mErrorMeters;
		private final double mConfidenceLevel;

		private DistanceMeasurement(double meters, double errorMeters, double confidenceLevel) {
		mMeters = meters;
		mErrorMeters = errorMeters;
		mConfidenceLevel = confidenceLevel;
		}

		/**
		* Distance measurement in meters
		*
		* @return distance in meters
		*/
		public double getMeters() {
		throw new UnsupportedOperationException();
		return mMeters;
		}

		/**
		@@ -43,7 +53,7 @@ public final class DistanceMeasurement {
		* @return error of distance measurement in meters
		*/
		public double getErrorMeters() {
		throw new UnsupportedOperationException();
		return mErrorMeters;
		}

		/**
		@@ -56,6 +66,80 @@ public final class DistanceMeasurement {
		*/
		@FloatRange(from = 0.0, to = 1.0)
		public double getConfidenceLevel() {
		throw new UnsupportedOperationException();
		return mConfidenceLevel;
		}

		/**
		* Builder to get a {@link DistanceMeasurement} object.
		*/
		public static final class Builder {
		private double mMeters = Double.NaN;
		private double mErrorMeters = Double.NaN;
		private double mConfidenceLevel = Double.NaN;

		/**
		* Set the distance measurement in meters
		*
		* @param meters distance in meters
		* @throws IllegalArgumentException if meters is NaN
		*/
		public Builder setMeters(double meters) {
		if (Double.isNaN(meters)) {
		throw new IllegalArgumentException("meters cannot be NaN");
		}
		mMeters = meters;
		return this;
		}

		/**
		* Set the distance error in meters
		*
		* @param errorMeters distance error in meters
		* @throws IllegalArgumentException if error is negative or NaN
		*/
		public Builder setErrorMeters(double errorMeters) {
		if (Double.isNaN(errorMeters) \|\| errorMeters < 0.0) {
		throw new IllegalArgumentException(
		"errorMeters must be >= 0.0 and not NaN: " + errorMeters);
		}
		mErrorMeters = errorMeters;
		return this;
		}

		/**
		* Set the confidence level
		*
		* @param confidenceLevel the confidence level in the distance measurement
		* @throws IllegalArgumentException if confidence level is not in the range of [0.0, 1.0]
		*/
		public Builder setConfidenceLevel(double confidenceLevel) {
		if (confidenceLevel < 0.0 \|\| confidenceLevel > 1.0) {
		throw new IllegalArgumentException(
		"confidenceLevel must be in the range [0.0, 1.0]: " + confidenceLevel);
		}
		mConfidenceLevel = confidenceLevel;
		return this;
		}

		/**
		* Builds the {@link DistanceMeasurement} object
		*
		* @throws IllegalStateException if meters, error, or confidence are not set
		*/
		public DistanceMeasurement build() {
		if (Double.isNaN(mMeters)) {
		throw new IllegalStateException("Meters cannot be NaN");
		}

		if (Double.isNaN(mErrorMeters)) {
		throw new IllegalStateException("Error meters cannot be NaN");
		}

		if (Double.isNaN(mConfidenceLevel)) {
		throw new IllegalStateException("Confidence level cannot be NaN");
		}

		return new DistanceMeasurement(mMeters, mErrorMeters, mConfidenceLevel);
		}
		}
		}

core/java/android/uwb/RangingMeasurement.java

+121 −5

Original line number	Diff line number	Diff line
		@@ -31,6 +31,22 @@ import java.lang.annotation.RetentionPolicy;
		* @hide
		*/
		public final class RangingMeasurement {
		private final UwbAddress mRemoteDeviceAddress;
		private final @Status int mStatus;
		private final long mElapsedRealtimeNanos;
		private final DistanceMeasurement mDistanceMeasurement;
		private final AngleOfArrivalMeasurement mAngleOfArrivalMeasurement;

		private RangingMeasurement(@NonNull UwbAddress remoteDeviceAddress, @Status int status,
		long elapsedRealtimeNanos, @Nullable DistanceMeasurement distanceMeasurement,
		@Nullable AngleOfArrivalMeasurement angleOfArrivalMeasurement) {
		mRemoteDeviceAddress = remoteDeviceAddress;
		mStatus = status;
		mElapsedRealtimeNanos = elapsedRealtimeNanos;
		mDistanceMeasurement = distanceMeasurement;
		mAngleOfArrivalMeasurement = angleOfArrivalMeasurement;
		}

		/**
		* Get the remote device's {@link UwbAddress}
		*
		@@ -38,7 +54,7 @@ public final class RangingMeasurement {
		*/
		@NonNull
		public UwbAddress getRemoteDeviceAddress() {
		throw new UnsupportedOperationException();
		return mRemoteDeviceAddress;
		}

		@Retention(RetentionPolicy.SOURCE)
		@@ -75,7 +91,7 @@ public final class RangingMeasurement {
		*/
		@Status
		public int getStatus() {
		throw new UnsupportedOperationException();
		return mStatus;
		}

		/**
		@@ -86,7 +102,7 @@ public final class RangingMeasurement {
		*/
		@SuppressLint("MethodNameUnits")
		public long getElapsedRealtimeNanos() {
		throw new UnsupportedOperationException();
		return mElapsedRealtimeNanos;
		}

		/**
		@@ -97,7 +113,7 @@ public final class RangingMeasurement {
		*/
		@Nullable
		public DistanceMeasurement getDistance() {
		throw new UnsupportedOperationException();
		return mDistanceMeasurement;
		}

		/**
		@@ -108,6 +124,106 @@ public final class RangingMeasurement {
		*/
		@Nullable
		public AngleOfArrivalMeasurement getAngleOfArrival() {
		throw new UnsupportedOperationException();
		return mAngleOfArrivalMeasurement;
		}

		/**
		* Builder for a {@link RangingMeasurement} object.
		*/
		public static final class Builder {
		private UwbAddress mRemoteDeviceAddress = null;
		private @Status int mStatus = RANGING_STATUS_FAILURE_UNKNOWN_ERROR;
		private long mElapsedRealtimeNanos = -1L;
		private DistanceMeasurement mDistanceMeasurement = null;
		private AngleOfArrivalMeasurement mAngleOfArrivalMeasurement = null;

		/**
		* Set the remote device address that this measurement is for
		*
		* @param remoteDeviceAddress remote device's address
		*/
		public Builder setRemoteDeviceAddress(@NonNull UwbAddress remoteDeviceAddress) {
		mRemoteDeviceAddress = remoteDeviceAddress;
		return this;
		}

		/**
		* Set the status of ranging measurement
		*
		* @param status the status of the ranging measurement
		*/
		public Builder setStatus(@Status int status) {
		mStatus = status;
		return this;
		}

		/**
		* Set the elapsed realtime in nanoseconds when the ranging measurement occurred
		*
		* @param elapsedRealtimeNanos time the ranging measurement occurred
		*/
		public Builder setElapsedRealtimeNanos(long elapsedRealtimeNanos) {
		if (elapsedRealtimeNanos < 0) {
		throw new IllegalArgumentException("elapsedRealtimeNanos must be >= 0");
		}
		mElapsedRealtimeNanos = elapsedRealtimeNanos;
		return this;
		}

		/**
		* Set the {@link DistanceMeasurement}
		*
		* @param distanceMeasurement the distance measurement for this ranging measurement
		*/
		public Builder setDistanceMeasurement(@NonNull DistanceMeasurement distanceMeasurement) {
		mDistanceMeasurement = distanceMeasurement;
		return this;
		}

		/**
		* Set the {@link AngleOfArrivalMeasurement}
		*
		* @param angleOfArrivalMeasurement the angle of arrival measurement for this ranging
		* measurement
		*/
		public Builder setAngleOfArrivalMeasurement(
		@NonNull AngleOfArrivalMeasurement angleOfArrivalMeasurement) {
		mAngleOfArrivalMeasurement = angleOfArrivalMeasurement;
		return this;
		}

		/**
		* Build the {@link RangingMeasurement} object
		*
		* @throws IllegalStateException if a distance or angle of arrival measurement is provided
		* but the measurement was not successful, if the
		* elapsedRealtimeNanos of the measurement is invalid, or
		* if no remote device address is set
		*/
		public RangingMeasurement build() {
		if (mStatus != RANGING_STATUS_SUCCESS) {
		if (mDistanceMeasurement != null) {
		throw new IllegalStateException(
		"Distance Measurement must be null if ranging is not successful");
		}

		if (mAngleOfArrivalMeasurement != null) {
		throw new IllegalStateException(
		"Angle of Arrival must be null if ranging is not successful");
		}
		}

		if (mRemoteDeviceAddress == null) {
		throw new IllegalStateException("No remote device address was set");
		}

		if (mElapsedRealtimeNanos < 0) {
		throw new IllegalStateException(
		"elapsedRealtimeNanos must be >=0: " + mElapsedRealtimeNanos);
		}

		return new RangingMeasurement(mRemoteDeviceAddress, mStatus, mElapsedRealtimeNanos,
		mDistanceMeasurement, mAngleOfArrivalMeasurement);
		}
		}
		}

core/java/android/uwb/RangingParams.java

+222 −16

File changed.

Preview size limit exceeded, changes collapsed.