From d4a4b1edd4c82d59f2454963939a6611f4dcd46c Mon Sep 17 00:00:00 2001 From: Etan Cohen Date: Mon, 12 Feb 2018 14:45:12 -0800 Subject: [RTT] Unhide error status code for non-support of IEEE 802.11mc Bug: 72975604 Bug: 73088768 Test: builds Change-Id: I3e07ee73221b280c69ace42481cad38d3abcbbea --- api/current.txt | 1 + wifi/java/android/net/wifi/rtt/RangingRequest.java | 10 ++++++++++ wifi/java/android/net/wifi/rtt/RangingResult.java | 4 +--- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/api/current.txt b/api/current.txt index 7150c29fe3cf..2ab236c1f49b 100644 --- a/api/current.txt +++ b/api/current.txt @@ -28555,6 +28555,7 @@ package android.net.wifi.rtt { method public void writeToParcel(android.os.Parcel, int); field public static final android.os.Parcelable.Creator CREATOR; field public static final int STATUS_FAIL = 1; // 0x1 + field public static final int STATUS_RESPONDER_DOES_NOT_SUPPORT_IEEE80211MC = 2; // 0x2 field public static final int STATUS_SUCCESS = 0; // 0x0 } diff --git a/wifi/java/android/net/wifi/rtt/RangingRequest.java b/wifi/java/android/net/wifi/rtt/RangingRequest.java index 52b3d8691c79..4348ed4f73e1 100644 --- a/wifi/java/android/net/wifi/rtt/RangingRequest.java +++ b/wifi/java/android/net/wifi/rtt/RangingRequest.java @@ -122,6 +122,11 @@ public final class RangingRequest implements Parcelable { * Add the device specified by the {@link ScanResult} to the list of devices with * which to measure range. The total number of peers added to a request cannot exceed the * limit specified by {@link #getMaxPeers()}. + *

+ * Ranging may not be supported if the Access Point does not support IEEE 802.11mc. Use + * {@link ScanResult#is80211mcResponder()} to verify the Access Point's capabilities. If + * not supported the result status will be + * {@link RangingResult#STATUS_RESPONDER_DOES_NOT_SUPPORT_IEEE80211MC}. * * @param apInfo Information of an Access Point (AP) obtained in a Scan Result. * @return The builder to facilitate chaining @@ -138,6 +143,11 @@ public final class RangingRequest implements Parcelable { * Add the devices specified by the {@link ScanResult}s to the list of devices with * which to measure range. The total number of peers added to a request cannot exceed the * limit specified by {@link #getMaxPeers()}. + *

+ * Ranging may not be supported if the Access Point does not support IEEE 802.11mc. Use + * {@link ScanResult#is80211mcResponder()} to verify the Access Point's capabilities. If + * not supported the result status will be + * {@link RangingResult#STATUS_RESPONDER_DOES_NOT_SUPPORT_IEEE80211MC}. * * @param apInfos Information of an Access Points (APs) obtained in a Scan Result. * @return The builder to facilitate chaining diff --git a/wifi/java/android/net/wifi/rtt/RangingResult.java b/wifi/java/android/net/wifi/rtt/RangingResult.java index f7c85671c220..5c9bd198e05b 100644 --- a/wifi/java/android/net/wifi/rtt/RangingResult.java +++ b/wifi/java/android/net/wifi/rtt/RangingResult.java @@ -42,7 +42,7 @@ public final class RangingResult implements Parcelable { private static final String TAG = "RangingResult"; /** @hide */ - @IntDef({STATUS_SUCCESS, STATUS_FAIL}) + @IntDef({STATUS_SUCCESS, STATUS_FAIL, STATUS_RESPONDER_DOES_NOT_SUPPORT_IEEE80211MC}) @Retention(RetentionPolicy.SOURCE) public @interface RangeResultStatus { } @@ -67,8 +67,6 @@ public final class RangingResult implements Parcelable { *

* On such a failure, the individual result fields of {@link RangingResult} such as * {@link RangingResult#getDistanceMm()} are invalid. - * - * @hide */ public static final int STATUS_RESPONDER_DOES_NOT_SUPPORT_IEEE80211MC = 2; -- cgit v1.2.3-59-g8ed1b