summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Etan Cohen <etancohen@google.com> 2016-11-07 23:35:37 +0000
committer android-build-merger <android-build-merger@google.com> 2016-11-07 23:35:37 +0000
commit60e673410090316e515dcd3e7abcfcede5232adb (patch)
treebfc3928e6e67bc24103d41c1cc1922aec65ba97e
parent1d10b88f404929f63b1b30eed9d31a755db6cb21 (diff)
parent13c76b77dc149386915eed5c0e22e97d9dc702cb (diff)
Merge "[AWARE] Fix visibility of Aware Characteristics API"
am: 13c76b77dc Change-Id: Ie12c01e0d8e29e13e2ebcf1f49c56a1a8f705637
-rw-r--r--wifi/java/android/net/wifi/aware/WifiAwareManager.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/wifi/java/android/net/wifi/aware/WifiAwareManager.java b/wifi/java/android/net/wifi/aware/WifiAwareManager.java
index 5528ff839ede..10b70abad9df 100644
--- a/wifi/java/android/net/wifi/aware/WifiAwareManager.java
+++ b/wifi/java/android/net/wifi/aware/WifiAwareManager.java
@@ -304,6 +304,7 @@ public class WifiAwareManager {
* limitations on configurations, e.g. the maximum service name length.
*
* @return An object specifying configuration limitations of Aware.
+ * @hide PROPOSED_AWARE_API
*/
public WifiAwareCharacteristics getCharacteristics() {
try {