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

Commit 717f59e0 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add UWB Tests to verify Builders and Parcels" am: 84afc97a am: 86d811e5 am: d947f25a 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1472364

Change-Id: I77cb51315534cfd76c2df14594150c3918723b83
parents a06b63bb d947f25a

core/java/android/uwb/AngleMeasurement.java

+28 −0
Original line number Diff line number Diff line
@@ -20,6 +20,8 @@ import android.annotation.FloatRange; 
import android.os.Parcel;

import android.os.Parcelable;



import java.util.Objects;



/**

 * Angle measurement

 *
@@ -75,6 +77,32 @@ public final class AngleMeasurement implements Parcelable { 
        return mConfidenceLevel;

    }



    /**

     * @hide

    */

    @Override

    public boolean equals(Object obj) {

        if (this == obj) {

            return true;

        }



        if (obj instanceof AngleMeasurement) {

            AngleMeasurement other = (AngleMeasurement) obj;

            return mRadians == other.getRadians()

                    && mErrorRadians == other.getErrorRadians()

                    && mConfidenceLevel == other.getConfidenceLevel();

        }

        return false;

    }



    /**

     * @hide

     */

    @Override

    public int hashCode() {

        return Objects.hash(mRadians, mErrorRadians, mConfidenceLevel);

    }



    @Override

    public int describeContents() {

        return 0;

core/java/android/uwb/AngleOfArrivalMeasurement.java

+27 −0
Original line number Diff line number Diff line
@@ -21,6 +21,8 @@ import android.annotation.Nullable; 
import android.os.Parcel;

import android.os.Parcelable;



import java.util.Objects;



/**

 * Represents an angle of arrival measurement between two devices using Ultra Wideband

 *
@@ -72,6 +74,31 @@ public final class AngleOfArrivalMeasurement implements Parcelable { 
        return mAltitudeAngleMeasurement;

    }



    /**

     * @hide

     */

    @Override

    public boolean equals(Object obj) {

        if (this == obj) {

            return true;

        }



        if (obj instanceof AngleOfArrivalMeasurement) {

            AngleOfArrivalMeasurement other = (AngleOfArrivalMeasurement) obj;

            return mAzimuthAngleMeasurement.equals(other.getAzimuth())

                    && mAltitudeAngleMeasurement.equals(other.getAltitude());

        }

        return false;

    }



    /**

     * @hide

     */

    @Override

    public int hashCode() {

        return Objects.hash(mAzimuthAngleMeasurement, mAltitudeAngleMeasurement);

    }



    @Override

    public int describeContents() {

        return 0;

core/java/android/uwb/DistanceMeasurement.java

+29 −0
Original line number Diff line number Diff line
@@ -17,9 +17,12 @@ 
package android.uwb;



import android.annotation.FloatRange;

import android.annotation.Nullable;

import android.os.Parcel;

import android.os.Parcelable;



import java.util.Objects;



/**

 * A data point for the distance measurement

 *
@@ -71,6 +74,32 @@ public final class DistanceMeasurement implements Parcelable { 
        return mConfidenceLevel;

    }



    /**

     * @hide

     */

    @Override

    public boolean equals(@Nullable Object obj) {

        if (this == obj) {

            return true;

        }



        if (obj instanceof DistanceMeasurement) {

            DistanceMeasurement other = (DistanceMeasurement) obj;

            return mMeters == other.getMeters()

                    && mErrorMeters == other.getErrorMeters()

                    && mConfidenceLevel == other.getConfidenceLevel();

        }

        return false;

    }



    /**

     * @hide

     */

    @Override

    public int hashCode() {

        return Objects.hash(mMeters, mErrorMeters, mConfidenceLevel);

    }



    @Override

    public int describeContents() {

        return 0;

core/java/android/uwb/RangingMeasurement.java

+30 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import android.os.SystemClock; 


import java.lang.annotation.Retention;

import java.lang.annotation.RetentionPolicy;

import java.util.Objects;



/**

 * Representation of a ranging measurement between the local device and a remote device
@@ -129,6 +130,35 @@ public final class RangingMeasurement implements Parcelable { 
        return mAngleOfArrivalMeasurement;

    }



    /**

     * @hide

     */

    @Override

    public boolean equals(@Nullable Object obj) {

        if (this == obj) {

            return true;

        }



        if (obj instanceof RangingMeasurement) {

            RangingMeasurement other = (RangingMeasurement) obj;

            return mRemoteDeviceAddress.equals(other.getRemoteDeviceAddress())

                    && mStatus == other.getStatus()

                    && mElapsedRealtimeNanos == other.getElapsedRealtimeNanos()

                    && mDistanceMeasurement.equals(other.getDistance())

                    && mAngleOfArrivalMeasurement.equals(other.getAngleOfArrival());

        }

        return false;

    }



    /**

     * @hide

     */

    @Override

    public int hashCode() {

        return Objects.hash(mRemoteDeviceAddress, mStatus, mElapsedRealtimeNanos,

                mDistanceMeasurement, mAngleOfArrivalMeasurement);

    }



    @Override

    public int describeContents() {

        return 0;

core/java/android/uwb/RangingParams.java

+38 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ import java.util.ArrayList; 
import java.util.Arrays;

import java.util.HashSet;

import java.util.List;

import java.util.Objects;

import java.util.Set;



/**
@@ -201,6 +202,43 @@ public final class RangingParams implements Parcelable { 
        return new PersistableBundle(mSpecificationParameters);

    }



    /**

     * @hide

     */

    @Override

    public boolean equals(@Nullable Object obj) {

        if (this == obj) {

            return true;

        }



        if (obj instanceof RangingParams) {

            RangingParams other = (RangingParams) obj;



            return mIsInitiator == other.mIsInitiator

                    && mIsController == other.mIsController

                    && mSamplePeriod.equals(other.mSamplePeriod)

                    && mLocalDeviceAddress.equals(other.mLocalDeviceAddress)

                    && mRemoteDeviceAddresses.equals(other.mRemoteDeviceAddresses)

                    && mChannelNumber == other.mChannelNumber

                    && mTransmitPreambleCodeIndex == other.mTransmitPreambleCodeIndex

                    && mReceivePreambleCodeIndex == other.mReceivePreambleCodeIndex

                    && mStsPhyPacketType == other.mStsPhyPacketType

                    && mSpecificationParameters.size() == other.mSpecificationParameters.size()

                    && mSpecificationParameters.kindofEquals(other.mSpecificationParameters);

        }

        return false;

    }



    /**

     * @hide

     */

    @Override

    public int hashCode() {

        return Objects.hash(mIsInitiator, mIsController, mSamplePeriod, mLocalDeviceAddress,

                mRemoteDeviceAddresses, mChannelNumber, mTransmitPreambleCodeIndex,

                mReceivePreambleCodeIndex, mStsPhyPacketType, mSpecificationParameters);

    }



    @Override

    public int describeContents() {

        return 0;