Merge "[AWARE] Fix visibility of Aware Characteristics API" am: 13c76b77dc

am: 60e6734100 Change-Id: I6e2b1496d2868787d7173ed239f8b6b6081b0d99
2016-11-07 23:40:35 +00:00
parent e327563c6c 60e6734100
commit 5f9b3d834b
1 changed files with 1 additions and 0 deletions
--- 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 {