Merge "[AWARE] Fix visibility of Aware Characteristics API"

am: 13c76b77dc Change-Id: Ie12c01e0d8e29e13e2ebcf1f49c56a1a8f705637
2016-11-07 23:35:37 +00:00
parent 1d10b88f40 13c76b77dc
commit 60e6734100
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 {