diff options
| author | Etan Cohen <etancohen@google.com> | 2017-01-11 23:12:16 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-01-11 23:12:16 +0000 |
| commit | 2a4e3bef2c734171eb17e44d31aeefe1e4502267 (patch) | |
| tree | 5f8a0859e4f3c78ab1202817a52b3e2a67f0ed93 /core/java | |
| parent | 425a0fdc95f2f3105ab2677a7fb469d5b19d8a78 (diff) | |
| parent | dfe8f5dc13f39b87ac6107c1a3b24db9b601597b (diff) | |
Merge "[AWARE] Unhide Wi-Fi Aware API (baseline)"
am: dfe8f5dc13
Change-Id: I581b72ce62966f4c04427603a2b9686dcf46cc42
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/content/Context.java | 4 | ||||
| -rw-r--r-- | core/java/android/content/pm/PackageManager.java | 2 | ||||
| -rw-r--r-- | core/java/android/net/NetworkCapabilities.java | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java index fd11031d5d7b..02b86fe33f3b 100644 --- a/core/java/android/content/Context.java +++ b/core/java/android/content/Context.java @@ -2768,6 +2768,9 @@ public abstract class Context { * connectivity. On releases before NYC, it should only be obtained from an application * context, and not from any other derived context to avoid memory leaks within the calling * process. + * <dt> {@link #WIFI_AWARE_SERVICE} ("wifiaware") + * <dd> A {@link android.net.wifi.aware.WifiAwareManager WifiAwareManager} for management of + * Wi-Fi Aware discovery and connectivity. * <dt> {@link #WIFI_P2P_SERVICE} ("wifip2p") * <dd> A {@link android.net.wifi.p2p.WifiP2pManager WifiP2pManager} for management of * Wi-Fi Direct connectivity. @@ -3144,7 +3147,6 @@ public abstract class Context { * * @see #getSystemService * @see android.net.wifi.aware.WifiAwareManager - * @hide PROPOSED_AWARE_API */ public static final String WIFI_AWARE_SERVICE = "wifiaware"; diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java index b0efd8925586..11e19f356113 100644 --- a/core/java/android/content/pm/PackageManager.java +++ b/core/java/android/content/pm/PackageManager.java @@ -2041,8 +2041,6 @@ public abstract class PackageManager { /** * Feature for {@link #getSystemAvailableFeatures} and * {@link #hasSystemFeature}: The device supports Wi-Fi Aware. - * - * @hide PROPOSED_AWARE_API */ @SdkConstant(SdkConstantType.FEATURE) public static final String FEATURE_WIFI_AWARE = "android.hardware.wifi.aware"; diff --git a/core/java/android/net/NetworkCapabilities.java b/core/java/android/net/NetworkCapabilities.java index dacea55baaba..4dd8ce9c8beb 100644 --- a/core/java/android/net/NetworkCapabilities.java +++ b/core/java/android/net/NetworkCapabilities.java @@ -420,8 +420,6 @@ public final class NetworkCapabilities implements Parcelable { /** * Indicates this network uses a Wi-Fi Aware transport. - * - * @hide PROPOSED_AWARE_API */ public static final int TRANSPORT_WIFI_AWARE = 5; |