summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Etan Cohen <etancohen@google.com> 2016-11-07 23:40:35 +0000
committer android-build-merger <android-build-merger@google.com> 2016-11-07 23:40:35 +0000
commit5f9b3d834b9d2d9b72ce459cba210bfe5b546b54 (patch)
tree58d09a6c38c70bc4dbfaefa3ae424a06bffc91e2
parente327563c6ca37a612445255064c969c5e2692ce5 (diff)
parent60e673410090316e515dcd3e7abcfcede5232adb (diff)
Merge "[AWARE] Fix visibility of Aware Characteristics API" am: 13c76b77dc
am: 60e6734100 Change-Id: I6e2b1496d2868787d7173ed239f8b6b6081b0d99
-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 {