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

Commit b73707c3 authored by Etan Cohen's avatar Etan Cohen
Browse files

[RTT2] Rename API Ap -> AccessPoint, timestamp 

API council feedback:
- Ap -> AccessPoint
- Timestamp -> add us unit

Bug: 65108607
Test: unit tests & integration test suite
Change-Id: I733ab9e07e7ced2fa15144eea2c395fe267ce974
parent 5a100a07

wifi/java/android/net/wifi/rtt/RangingRequest.java

+7 −7
Original line number Diff line number Diff line
@@ -42,8 +42,8 @@ import java.util.StringJoiner; 
 * {@link WifiRttManager#startRanging(RangingRequest, RangingResultCallback, Handler)}.

 * <p>

 * The ranging request is a batch request - specifying a set of devices (specified using

 * {@link RangingRequest.Builder#addAp(ScanResult)} and

 * {@link RangingRequest.Builder#addAps(List)}).

 * {@link RangingRequest.Builder#addAccessPoint(ScanResult)} and

 * {@link RangingRequest.Builder#addAccessPoints(List)}).

 *

 * @hide RTT_API

 */
@@ -53,8 +53,8 @@ public final class RangingRequest implements Parcelable { 
    /**

     * Returns the maximum number of peers to range which can be specified in a single {@code

     * RangingRequest}. The limit applies no matter how the peers are added to the request, e.g.

     * through {@link RangingRequest.Builder#addAp(ScanResult)} or

     * {@link RangingRequest.Builder#addAps(List)}.

     * through {@link RangingRequest.Builder#addAccessPoint(ScanResult)} or

     * {@link RangingRequest.Builder#addAccessPoints(List)}.

     *

     * @return Maximum number of peers.

     */
@@ -148,7 +148,7 @@ public final class RangingRequest implements Parcelable { 
         * @return The builder to facilitate chaining

         *         {@code builder.setXXX(..).setXXX(..)}.

         */

        public Builder addAp(ScanResult apInfo) {

        public Builder addAccessPoint(ScanResult apInfo) {

            if (apInfo == null) {

                throw new IllegalArgumentException("Null ScanResult!");

            }
@@ -165,12 +165,12 @@ public final class RangingRequest implements Parcelable { 
         * @return The builder to facilitate chaining

         *         {@code builder.setXXX(..).setXXX(..)}.

         */

        public Builder addAps(List<ScanResult> apInfos) {

        public Builder addAccessPoints(List<ScanResult> apInfos) {

            if (apInfos == null) {

                throw new IllegalArgumentException("Null list of ScanResults!");

            }

            for (ScanResult scanResult : apInfos) {

                addAp(scanResult);

                addAccessPoint(scanResult);

            }

            return this;

        }

wifi/java/android/net/wifi/rtt/RangingResult.java

+2 −2
Original line number Diff line number Diff line
@@ -148,11 +148,11 @@ public final class RangingResult implements Parcelable { 
    }



    /**

     * @return The timestamp (in us) at which the ranging operation was performed

     * @return The timestamp, in us since boot, at which the ranging operation was performed.

     * <p>

     * Only valid if {@link #getStatus()} returns {@link RangingResultCallback#STATUS_SUCCESS}.

     */

    public long getRangingTimestamp() {

    public long getRangingTimestampUs() {

        return mTimestamp;

    }

wifi/tests/src/android/net/wifi/rtt/WifiRttManagerTest.java

+8 −8
Original line number Diff line number Diff line
@@ -139,8 +139,8 @@ public class WifiRttManagerTest { 
        PeerHandle peerHandle1 = new PeerHandle(12);



        RangingRequest.Builder builder = new RangingRequest.Builder();

        builder.addAp(scanResult1);

        builder.addAps(scanResults2and3);

        builder.addAccessPoint(scanResult1);

        builder.addAccessPoints(scanResults2and3);

        builder.addWifiAwarePeer(mac1);

        builder.addWifiAwarePeer(peerHandle1);

        RangingRequest request = builder.build();
@@ -173,9 +173,9 @@ public class WifiRttManagerTest { 


        // create request

        RangingRequest.Builder builder = new RangingRequest.Builder();

        builder.addAp(scanResult);

        builder.addAps(scanResultList);

        builder.addAp(scanResult);

        builder.addAccessPoint(scanResult);

        builder.addAccessPoints(scanResultList);

        builder.addAccessPoint(scanResult);

        builder.addWifiAwarePeer(mac1);

        RangingRequest request = builder.build();
@@ -197,9 +197,9 @@ public class WifiRttManagerTest { 


        // create request

        RangingRequest.Builder builder = new RangingRequest.Builder();

        builder.addAp(scanResult);

        builder.addAps(scanResultList);

        builder.addAp(scanResult);

        builder.addAccessPoint(scanResult);

        builder.addAccessPoints(scanResultList);

        builder.addAccessPoint(scanResult);

        builder.addWifiAwarePeer(mac1);

        RangingRequest request = builder.build();