summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Etan Cohen <etancohen@google.com> 2016-07-15 16:52:06 +0000
committer android-build-merger <android-build-merger@google.com> 2016-07-15 16:52:06 +0000
commit73867f93cfc51f8ac5486e483a784d09cf82d3be (patch)
treef32993d9d8908260e6f53044d288a5e64fee5e3f
parent074aec74d47e9a46ecca6a4c2cc1505769bc3c29 (diff)
parentab9ef45971fc41bc078ad1362845309ef02f62f9 (diff)
[NAN] NAN System Api: RTT
am: ab9ef45971 Change-Id: I34039caac1a40a2c26d8a89d5a0d938fa5a4af62
-rw-r--r--wifi/java/android/net/wifi/nan/ConfigRequest.java1
-rw-r--r--wifi/java/android/net/wifi/nan/WifiNanManager.java1
-rw-r--r--wifi/java/android/net/wifi/nan/WifiNanSession.java3
3 files changed, 4 insertions, 1 deletions
diff --git a/wifi/java/android/net/wifi/nan/ConfigRequest.java b/wifi/java/android/net/wifi/nan/ConfigRequest.java
index 759098e9b0c2..cd47359d16d2 100644
--- a/wifi/java/android/net/wifi/nan/ConfigRequest.java
+++ b/wifi/java/android/net/wifi/nan/ConfigRequest.java
@@ -16,6 +16,7 @@
package android.net.wifi.nan;
+import android.annotation.SystemApi;
import android.os.Parcel;
import android.os.Parcelable;
diff --git a/wifi/java/android/net/wifi/nan/WifiNanManager.java b/wifi/java/android/net/wifi/nan/WifiNanManager.java
index ae0cfcd7dde2..a58cdb7570b7 100644
--- a/wifi/java/android/net/wifi/nan/WifiNanManager.java
+++ b/wifi/java/android/net/wifi/nan/WifiNanManager.java
@@ -21,6 +21,7 @@ import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.SdkConstant;
import android.annotation.SdkConstant.SdkConstantType;
+import android.annotation.SystemApi;
import android.net.wifi.RttManager;
import android.os.Binder;
import android.os.Bundle;
diff --git a/wifi/java/android/net/wifi/nan/WifiNanSession.java b/wifi/java/android/net/wifi/nan/WifiNanSession.java
index ad9e7c3cc6f1..8eb2f89ccb9f 100644
--- a/wifi/java/android/net/wifi/nan/WifiNanSession.java
+++ b/wifi/java/android/net/wifi/nan/WifiNanSession.java
@@ -17,6 +17,7 @@
package android.net.wifi.nan;
import android.annotation.Nullable;
+import android.annotation.SystemApi;
import android.net.wifi.RttManager;
import android.util.Log;
@@ -167,7 +168,7 @@ public class WifiNanSession {
* {@link android.net.wifi.RttManager.RttParams#bssid} member must be set to
* a peer ID - not to a MAC address.
* @param listener The listener to receive the results of the ranging session.
- * @hide (RTT API isn't public yet so can't unhide here)
+ * @hide PROPOSED_NAN_SYSTEM_API [TODO: b/28847998 - track RTT API & visilibity]
*/
public void startRanging(RttManager.RttParams[] params, RttManager.RttListener listener) {
if (mTerminated) {