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

am: 5f9b3d834b Change-Id: I50b5ef421fcaf8d7ec83bb00024f048dcd5378c0
2016-11-07 23:50:07 +00:00
parent 449f53c52a 5f9b3d834b
commit 2a9cc83dee
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 {