From 6a4b323f08cea4eb538883127ff07302c3b10c46 Mon Sep 17 00:00:00 2001 From: Etan Cohen Date: Mon, 9 Jan 2017 21:47:32 -0800 Subject: [PATCH] [AWARE] Unhide Wi-Fi Aware API (baseline) Baseline Wi-Fi Aware API providing discovery and connectivity (data-path). Bug: 30983968 Test: unit tests + integration (sl4a) tests passing. Change-Id: Idd7c6a625f168717b083d5f13e291ce916571933 --- api/current.txt | 119 ++++++++++++++++++ api/system-current.txt | 119 ++++++++++++++++++ api/test-current.txt | 119 ++++++++++++++++++ core/java/android/content/Context.java | 4 +- .../android/content/pm/PackageManager.java | 2 - .../java/android/net/NetworkCapabilities.java | 2 - .../net/wifi/aware/AttachCallback.java | 2 - .../net/wifi/aware/Characteristics.java | 4 +- .../net/wifi/aware/DiscoverySession.java | 5 +- .../wifi/aware/DiscoverySessionCallback.java | 2 - .../wifi/aware/IdentityChangedListener.java | 2 - .../android/net/wifi/aware/PeerHandle.java | 2 - .../android/net/wifi/aware/PublishConfig.java | 2 - .../wifi/aware/PublishDiscoverySession.java | 2 - .../net/wifi/aware/SubscribeConfig.java | 2 - .../wifi/aware/SubscribeDiscoverySession.java | 2 - .../net/wifi/aware/WifiAwareManager.java | 3 - .../net/wifi/aware/WifiAwareSession.java | 2 - wifi/java/android/net/wifi/aware/package.html | 2 +- 19 files changed, 363 insertions(+), 34 deletions(-) diff --git a/api/current.txt b/api/current.txt index dbe8399e7b65e..2539699e76eba 100644 --- a/api/current.txt +++ b/api/current.txt @@ -8226,6 +8226,7 @@ package android.content { field public static final java.lang.String USER_SERVICE = "user"; field public static final java.lang.String VIBRATOR_SERVICE = "vibrator"; field public static final java.lang.String WALLPAPER_SERVICE = "wallpaper"; + field public static final java.lang.String WIFI_AWARE_SERVICE = "wifiaware"; field public static final java.lang.String WIFI_P2P_SERVICE = "wifip2p"; field public static final java.lang.String WIFI_SERVICE = "wifi"; field public static final java.lang.String WINDOW_SERVICE = "window"; @@ -9886,6 +9887,7 @@ package android.content.pm { field public static final java.lang.String FEATURE_WATCH = "android.hardware.type.watch"; field public static final java.lang.String FEATURE_WEBVIEW = "android.software.webview"; field public static final java.lang.String FEATURE_WIFI = "android.hardware.wifi"; + field public static final java.lang.String FEATURE_WIFI_AWARE = "android.hardware.wifi.aware"; field public static final java.lang.String FEATURE_WIFI_DIRECT = "android.hardware.wifi.direct"; field public static final int GET_ACTIVITIES = 1; // 0x1 field public static final int GET_CONFIGURATIONS = 16384; // 0x4000 @@ -23771,6 +23773,7 @@ package android.net { field public static final int TRANSPORT_ETHERNET = 3; // 0x3 field public static final int TRANSPORT_VPN = 4; // 0x4 field public static final int TRANSPORT_WIFI = 1; // 0x1 + field public static final int TRANSPORT_WIFI_AWARE = 5; // 0x5 } public class NetworkInfo implements android.os.Parcelable { @@ -24777,6 +24780,122 @@ package android.net.wifi { } +package android.net.wifi.aware { + + public class AttachCallback { + ctor public AttachCallback(); + method public void onAttachFailed(); + method public void onAttached(android.net.wifi.aware.WifiAwareSession); + } + + public final class Characteristics implements android.os.Parcelable { + method public int describeContents(); + method public int getMaxMatchFilterLength(); + method public int getMaxServiceNameLength(); + method public int getMaxServiceSpecificInfoLength(); + method public void writeToParcel(android.os.Parcel, int); + field public static final android.os.Parcelable.Creator CREATOR; + } + + public class DiscoverySession { + method public java.lang.String createNetworkSpecifier(android.net.wifi.aware.PeerHandle, byte[]); + method public void destroy(); + method public static int getMaxSendRetryCount(); + method public void sendMessage(android.net.wifi.aware.PeerHandle, int, byte[], int); + method public void sendMessage(android.net.wifi.aware.PeerHandle, int, byte[]); + } + + public class DiscoverySessionCallback { + ctor public DiscoverySessionCallback(); + method public void onMessageReceived(android.net.wifi.aware.PeerHandle, byte[]); + method public void onMessageSendFailed(int); + method public void onMessageSendSucceeded(int); + method public void onPublishStarted(android.net.wifi.aware.PublishDiscoverySession); + method public void onServiceDiscovered(android.net.wifi.aware.PeerHandle, byte[], java.util.List); + method public void onSessionConfigFailed(); + method public void onSessionConfigUpdated(); + method public void onSessionTerminated(); + method public void onSubscribeStarted(android.net.wifi.aware.SubscribeDiscoverySession); + } + + public class IdentityChangedListener { + ctor public IdentityChangedListener(); + method public void onIdentityChanged(byte[]); + } + + public class PeerHandle { + } + + public final class PublishConfig implements android.os.Parcelable { + method public int describeContents(); + method public void writeToParcel(android.os.Parcel, int); + field public static final android.os.Parcelable.Creator CREATOR; + field public static final int PUBLISH_TYPE_SOLICITED = 1; // 0x1 + field public static final int PUBLISH_TYPE_UNSOLICITED = 0; // 0x0 + } + + public static final class PublishConfig.Builder { + ctor public PublishConfig.Builder(); + method public android.net.wifi.aware.PublishConfig build(); + method public android.net.wifi.aware.PublishConfig.Builder setMatchFilter(java.util.List); + method public android.net.wifi.aware.PublishConfig.Builder setPublishCount(int); + method public android.net.wifi.aware.PublishConfig.Builder setPublishType(int); + method public android.net.wifi.aware.PublishConfig.Builder setServiceName(java.lang.String); + method public android.net.wifi.aware.PublishConfig.Builder setServiceSpecificInfo(byte[]); + method public android.net.wifi.aware.PublishConfig.Builder setTerminateNotificationEnabled(boolean); + method public android.net.wifi.aware.PublishConfig.Builder setTtlSec(int); + } + + public class PublishDiscoverySession extends android.net.wifi.aware.DiscoverySession { + method public void updatePublish(android.net.wifi.aware.PublishConfig); + } + + public final class SubscribeConfig implements android.os.Parcelable { + method public int describeContents(); + method public void writeToParcel(android.os.Parcel, int); + field public static final android.os.Parcelable.Creator CREATOR; + field public static final int MATCH_STYLE_ALL = 1; // 0x1 + field public static final int MATCH_STYLE_FIRST_ONLY = 0; // 0x0 + field public static final int SUBSCRIBE_TYPE_ACTIVE = 1; // 0x1 + field public static final int SUBSCRIBE_TYPE_PASSIVE = 0; // 0x0 + } + + public static final class SubscribeConfig.Builder { + ctor public SubscribeConfig.Builder(); + method public android.net.wifi.aware.SubscribeConfig build(); + method public android.net.wifi.aware.SubscribeConfig.Builder setMatchFilter(java.util.List); + method public android.net.wifi.aware.SubscribeConfig.Builder setMatchStyle(int); + method public android.net.wifi.aware.SubscribeConfig.Builder setServiceName(java.lang.String); + method public android.net.wifi.aware.SubscribeConfig.Builder setServiceSpecificInfo(byte[]); + method public android.net.wifi.aware.SubscribeConfig.Builder setSubscribeCount(int); + method public android.net.wifi.aware.SubscribeConfig.Builder setSubscribeType(int); + method public android.net.wifi.aware.SubscribeConfig.Builder setTerminateNotificationEnabled(boolean); + method public android.net.wifi.aware.SubscribeConfig.Builder setTtlSec(int); + } + + public class SubscribeDiscoverySession extends android.net.wifi.aware.DiscoverySession { + method public void updateSubscribe(android.net.wifi.aware.SubscribeConfig); + } + + public class WifiAwareManager { + method public void attach(android.net.wifi.aware.AttachCallback, android.os.Handler); + method public void attach(android.net.wifi.aware.AttachCallback, android.net.wifi.aware.IdentityChangedListener, android.os.Handler); + method public android.net.wifi.aware.Characteristics getCharacteristics(); + method public boolean isAvailable(); + field public static final java.lang.String ACTION_WIFI_AWARE_STATE_CHANGED = "android.net.wifi.aware.action.WIFI_AWARE_STATE_CHANGED"; + field public static final int WIFI_AWARE_DATA_PATH_ROLE_INITIATOR = 0; // 0x0 + field public static final int WIFI_AWARE_DATA_PATH_ROLE_RESPONDER = 1; // 0x1 + } + + public class WifiAwareSession { + method public java.lang.String createNetworkSpecifier(int, byte[], byte[]); + method public void destroy(); + method public void publish(android.net.wifi.aware.PublishConfig, android.net.wifi.aware.DiscoverySessionCallback, android.os.Handler); + method public void subscribe(android.net.wifi.aware.SubscribeConfig, android.net.wifi.aware.DiscoverySessionCallback, android.os.Handler); + } + +} + package android.net.wifi.p2p { public class WifiP2pConfig implements android.os.Parcelable { diff --git a/api/system-current.txt b/api/system-current.txt index 6d8b2804c8d90..ecebad5593bad 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -8561,6 +8561,7 @@ package android.content { field public static final java.lang.String USER_SERVICE = "user"; field public static final java.lang.String VIBRATOR_SERVICE = "vibrator"; field public static final java.lang.String WALLPAPER_SERVICE = "wallpaper"; + field public static final java.lang.String WIFI_AWARE_SERVICE = "wifiaware"; field public static final java.lang.String WIFI_P2P_SERVICE = "wifip2p"; field public static final java.lang.String WIFI_RTT_SERVICE = "rttmanager"; field public static final java.lang.String WIFI_SCANNING_SERVICE = "wifiscanner"; @@ -10268,6 +10269,7 @@ package android.content.pm { field public static final java.lang.String FEATURE_WATCH = "android.hardware.type.watch"; field public static final java.lang.String FEATURE_WEBVIEW = "android.software.webview"; field public static final java.lang.String FEATURE_WIFI = "android.hardware.wifi"; + field public static final java.lang.String FEATURE_WIFI_AWARE = "android.hardware.wifi.aware"; field public static final java.lang.String FEATURE_WIFI_DIRECT = "android.hardware.wifi.direct"; field public static final int FLAG_PERMISSION_GRANTED_BY_DEFAULT = 32; // 0x20 field public static final int FLAG_PERMISSION_POLICY_FIXED = 4; // 0x4 @@ -25606,6 +25608,7 @@ package android.net { field public static final int TRANSPORT_ETHERNET = 3; // 0x3 field public static final int TRANSPORT_VPN = 4; // 0x4 field public static final int TRANSPORT_WIFI = 1; // 0x1 + field public static final int TRANSPORT_WIFI_AWARE = 5; // 0x5 } public class NetworkInfo implements android.os.Parcelable { @@ -27315,6 +27318,122 @@ package android.net.wifi { } +package android.net.wifi.aware { + + public class AttachCallback { + ctor public AttachCallback(); + method public void onAttachFailed(); + method public void onAttached(android.net.wifi.aware.WifiAwareSession); + } + + public final class Characteristics implements android.os.Parcelable { + method public int describeContents(); + method public int getMaxMatchFilterLength(); + method public int getMaxServiceNameLength(); + method public int getMaxServiceSpecificInfoLength(); + method public void writeToParcel(android.os.Parcel, int); + field public static final android.os.Parcelable.Creator CREATOR; + } + + public class DiscoverySession { + method public java.lang.String createNetworkSpecifier(android.net.wifi.aware.PeerHandle, byte[]); + method public void destroy(); + method public static int getMaxSendRetryCount(); + method public void sendMessage(android.net.wifi.aware.PeerHandle, int, byte[], int); + method public void sendMessage(android.net.wifi.aware.PeerHandle, int, byte[]); + } + + public class DiscoverySessionCallback { + ctor public DiscoverySessionCallback(); + method public void onMessageReceived(android.net.wifi.aware.PeerHandle, byte[]); + method public void onMessageSendFailed(int); + method public void onMessageSendSucceeded(int); + method public void onPublishStarted(android.net.wifi.aware.PublishDiscoverySession); + method public void onServiceDiscovered(android.net.wifi.aware.PeerHandle, byte[], java.util.List); + method public void onSessionConfigFailed(); + method public void onSessionConfigUpdated(); + method public void onSessionTerminated(); + method public void onSubscribeStarted(android.net.wifi.aware.SubscribeDiscoverySession); + } + + public class IdentityChangedListener { + ctor public IdentityChangedListener(); + method public void onIdentityChanged(byte[]); + } + + public class PeerHandle { + } + + public final class PublishConfig implements android.os.Parcelable { + method public int describeContents(); + method public void writeToParcel(android.os.Parcel, int); + field public static final android.os.Parcelable.Creator CREATOR; + field public static final int PUBLISH_TYPE_SOLICITED = 1; // 0x1 + field public static final int PUBLISH_TYPE_UNSOLICITED = 0; // 0x0 + } + + public static final class PublishConfig.Builder { + ctor public PublishConfig.Builder(); + method public android.net.wifi.aware.PublishConfig build(); + method public android.net.wifi.aware.PublishConfig.Builder setMatchFilter(java.util.List); + method public android.net.wifi.aware.PublishConfig.Builder setPublishCount(int); + method public android.net.wifi.aware.PublishConfig.Builder setPublishType(int); + method public android.net.wifi.aware.PublishConfig.Builder setServiceName(java.lang.String); + method public android.net.wifi.aware.PublishConfig.Builder setServiceSpecificInfo(byte[]); + method public android.net.wifi.aware.PublishConfig.Builder setTerminateNotificationEnabled(boolean); + method public android.net.wifi.aware.PublishConfig.Builder setTtlSec(int); + } + + public class PublishDiscoverySession extends android.net.wifi.aware.DiscoverySession { + method public void updatePublish(android.net.wifi.aware.PublishConfig); + } + + public final class SubscribeConfig implements android.os.Parcelable { + method public int describeContents(); + method public void writeToParcel(android.os.Parcel, int); + field public static final android.os.Parcelable.Creator CREATOR; + field public static final int MATCH_STYLE_ALL = 1; // 0x1 + field public static final int MATCH_STYLE_FIRST_ONLY = 0; // 0x0 + field public static final int SUBSCRIBE_TYPE_ACTIVE = 1; // 0x1 + field public static final int SUBSCRIBE_TYPE_PASSIVE = 0; // 0x0 + } + + public static final class SubscribeConfig.Builder { + ctor public SubscribeConfig.Builder(); + method public android.net.wifi.aware.SubscribeConfig build(); + method public android.net.wifi.aware.SubscribeConfig.Builder setMatchFilter(java.util.List); + method public android.net.wifi.aware.SubscribeConfig.Builder setMatchStyle(int); + method public android.net.wifi.aware.SubscribeConfig.Builder setServiceName(java.lang.String); + method public android.net.wifi.aware.SubscribeConfig.Builder setServiceSpecificInfo(byte[]); + method public android.net.wifi.aware.SubscribeConfig.Builder setSubscribeCount(int); + method public android.net.wifi.aware.SubscribeConfig.Builder setSubscribeType(int); + method public android.net.wifi.aware.SubscribeConfig.Builder setTerminateNotificationEnabled(boolean); + method public android.net.wifi.aware.SubscribeConfig.Builder setTtlSec(int); + } + + public class SubscribeDiscoverySession extends android.net.wifi.aware.DiscoverySession { + method public void updateSubscribe(android.net.wifi.aware.SubscribeConfig); + } + + public class WifiAwareManager { + method public void attach(android.net.wifi.aware.AttachCallback, android.os.Handler); + method public void attach(android.net.wifi.aware.AttachCallback, android.net.wifi.aware.IdentityChangedListener, android.os.Handler); + method public android.net.wifi.aware.Characteristics getCharacteristics(); + method public boolean isAvailable(); + field public static final java.lang.String ACTION_WIFI_AWARE_STATE_CHANGED = "android.net.wifi.aware.action.WIFI_AWARE_STATE_CHANGED"; + field public static final int WIFI_AWARE_DATA_PATH_ROLE_INITIATOR = 0; // 0x0 + field public static final int WIFI_AWARE_DATA_PATH_ROLE_RESPONDER = 1; // 0x1 + } + + public class WifiAwareSession { + method public java.lang.String createNetworkSpecifier(int, byte[], byte[]); + method public void destroy(); + method public void publish(android.net.wifi.aware.PublishConfig, android.net.wifi.aware.DiscoverySessionCallback, android.os.Handler); + method public void subscribe(android.net.wifi.aware.SubscribeConfig, android.net.wifi.aware.DiscoverySessionCallback, android.os.Handler); + } + +} + package android.net.wifi.p2p { public class WifiP2pConfig implements android.os.Parcelable { diff --git a/api/test-current.txt b/api/test-current.txt index ea7e58ac69aa9..490d499bf1db5 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -8237,6 +8237,7 @@ package android.content { field public static final java.lang.String USER_SERVICE = "user"; field public static final java.lang.String VIBRATOR_SERVICE = "vibrator"; field public static final java.lang.String WALLPAPER_SERVICE = "wallpaper"; + field public static final java.lang.String WIFI_AWARE_SERVICE = "wifiaware"; field public static final java.lang.String WIFI_P2P_SERVICE = "wifip2p"; field public static final java.lang.String WIFI_SERVICE = "wifi"; field public static final java.lang.String WINDOW_SERVICE = "window"; @@ -9902,6 +9903,7 @@ package android.content.pm { field public static final java.lang.String FEATURE_WATCH = "android.hardware.type.watch"; field public static final java.lang.String FEATURE_WEBVIEW = "android.software.webview"; field public static final java.lang.String FEATURE_WIFI = "android.hardware.wifi"; + field public static final java.lang.String FEATURE_WIFI_AWARE = "android.hardware.wifi.aware"; field public static final java.lang.String FEATURE_WIFI_DIRECT = "android.hardware.wifi.direct"; field public static final int GET_ACTIVITIES = 1; // 0x1 field public static final int GET_CONFIGURATIONS = 16384; // 0x4000 @@ -23844,6 +23846,7 @@ package android.net { field public static final int TRANSPORT_ETHERNET = 3; // 0x3 field public static final int TRANSPORT_VPN = 4; // 0x4 field public static final int TRANSPORT_WIFI = 1; // 0x1 + field public static final int TRANSPORT_WIFI_AWARE = 5; // 0x5 } public class NetworkInfo implements android.os.Parcelable { @@ -24850,6 +24853,122 @@ package android.net.wifi { } +package android.net.wifi.aware { + + public class AttachCallback { + ctor public AttachCallback(); + method public void onAttachFailed(); + method public void onAttached(android.net.wifi.aware.WifiAwareSession); + } + + public final class Characteristics implements android.os.Parcelable { + method public int describeContents(); + method public int getMaxMatchFilterLength(); + method public int getMaxServiceNameLength(); + method public int getMaxServiceSpecificInfoLength(); + method public void writeToParcel(android.os.Parcel, int); + field public static final android.os.Parcelable.Creator CREATOR; + } + + public class DiscoverySession { + method public java.lang.String createNetworkSpecifier(android.net.wifi.aware.PeerHandle, byte[]); + method public void destroy(); + method public static int getMaxSendRetryCount(); + method public void sendMessage(android.net.wifi.aware.PeerHandle, int, byte[], int); + method public void sendMessage(android.net.wifi.aware.PeerHandle, int, byte[]); + } + + public class DiscoverySessionCallback { + ctor public DiscoverySessionCallback(); + method public void onMessageReceived(android.net.wifi.aware.PeerHandle, byte[]); + method public void onMessageSendFailed(int); + method public void onMessageSendSucceeded(int); + method public void onPublishStarted(android.net.wifi.aware.PublishDiscoverySession); + method public void onServiceDiscovered(android.net.wifi.aware.PeerHandle, byte[], java.util.List); + method public void onSessionConfigFailed(); + method public void onSessionConfigUpdated(); + method public void onSessionTerminated(); + method public void onSubscribeStarted(android.net.wifi.aware.SubscribeDiscoverySession); + } + + public class IdentityChangedListener { + ctor public IdentityChangedListener(); + method public void onIdentityChanged(byte[]); + } + + public class PeerHandle { + } + + public final class PublishConfig implements android.os.Parcelable { + method public int describeContents(); + method public void writeToParcel(android.os.Parcel, int); + field public static final android.os.Parcelable.Creator CREATOR; + field public static final int PUBLISH_TYPE_SOLICITED = 1; // 0x1 + field public static final int PUBLISH_TYPE_UNSOLICITED = 0; // 0x0 + } + + public static final class PublishConfig.Builder { + ctor public PublishConfig.Builder(); + method public android.net.wifi.aware.PublishConfig build(); + method public android.net.wifi.aware.PublishConfig.Builder setMatchFilter(java.util.List); + method public android.net.wifi.aware.PublishConfig.Builder setPublishCount(int); + method public android.net.wifi.aware.PublishConfig.Builder setPublishType(int); + method public android.net.wifi.aware.PublishConfig.Builder setServiceName(java.lang.String); + method public android.net.wifi.aware.PublishConfig.Builder setServiceSpecificInfo(byte[]); + method public android.net.wifi.aware.PublishConfig.Builder setTerminateNotificationEnabled(boolean); + method public android.net.wifi.aware.PublishConfig.Builder setTtlSec(int); + } + + public class PublishDiscoverySession extends android.net.wifi.aware.DiscoverySession { + method public void updatePublish(android.net.wifi.aware.PublishConfig); + } + + public final class SubscribeConfig implements android.os.Parcelable { + method public int describeContents(); + method public void writeToParcel(android.os.Parcel, int); + field public static final android.os.Parcelable.Creator CREATOR; + field public static final int MATCH_STYLE_ALL = 1; // 0x1 + field public static final int MATCH_STYLE_FIRST_ONLY = 0; // 0x0 + field public static final int SUBSCRIBE_TYPE_ACTIVE = 1; // 0x1 + field public static final int SUBSCRIBE_TYPE_PASSIVE = 0; // 0x0 + } + + public static final class SubscribeConfig.Builder { + ctor public SubscribeConfig.Builder(); + method public android.net.wifi.aware.SubscribeConfig build(); + method public android.net.wifi.aware.SubscribeConfig.Builder setMatchFilter(java.util.List); + method public android.net.wifi.aware.SubscribeConfig.Builder setMatchStyle(int); + method public android.net.wifi.aware.SubscribeConfig.Builder setServiceName(java.lang.String); + method public android.net.wifi.aware.SubscribeConfig.Builder setServiceSpecificInfo(byte[]); + method public android.net.wifi.aware.SubscribeConfig.Builder setSubscribeCount(int); + method public android.net.wifi.aware.SubscribeConfig.Builder setSubscribeType(int); + method public android.net.wifi.aware.SubscribeConfig.Builder setTerminateNotificationEnabled(boolean); + method public android.net.wifi.aware.SubscribeConfig.Builder setTtlSec(int); + } + + public class SubscribeDiscoverySession extends android.net.wifi.aware.DiscoverySession { + method public void updateSubscribe(android.net.wifi.aware.SubscribeConfig); + } + + public class WifiAwareManager { + method public void attach(android.net.wifi.aware.AttachCallback, android.os.Handler); + method public void attach(android.net.wifi.aware.AttachCallback, android.net.wifi.aware.IdentityChangedListener, android.os.Handler); + method public android.net.wifi.aware.Characteristics getCharacteristics(); + method public boolean isAvailable(); + field public static final java.lang.String ACTION_WIFI_AWARE_STATE_CHANGED = "android.net.wifi.aware.action.WIFI_AWARE_STATE_CHANGED"; + field public static final int WIFI_AWARE_DATA_PATH_ROLE_INITIATOR = 0; // 0x0 + field public static final int WIFI_AWARE_DATA_PATH_ROLE_RESPONDER = 1; // 0x1 + } + + public class WifiAwareSession { + method public java.lang.String createNetworkSpecifier(int, byte[], byte[]); + method public void destroy(); + method public void publish(android.net.wifi.aware.PublishConfig, android.net.wifi.aware.DiscoverySessionCallback, android.os.Handler); + method public void subscribe(android.net.wifi.aware.SubscribeConfig, android.net.wifi.aware.DiscoverySessionCallback, android.os.Handler); + } + +} + package android.net.wifi.p2p { public class WifiP2pConfig implements android.os.Parcelable { diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java index fd11031d5d7b5..02b86fe33f3bf 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. + *
{@link #WIFI_AWARE_SERVICE} ("wifiaware") + *
A {@link android.net.wifi.aware.WifiAwareManager WifiAwareManager} for management of + * Wi-Fi Aware discovery and connectivity. *
{@link #WIFI_P2P_SERVICE} ("wifip2p") *
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 b0efd89255869..11e19f356113c 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 dacea55baabaa..4dd8ce9c8bebc 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; diff --git a/wifi/java/android/net/wifi/aware/AttachCallback.java b/wifi/java/android/net/wifi/aware/AttachCallback.java index 90216f3f71d34..c368b4692de4b 100644 --- a/wifi/java/android/net/wifi/aware/AttachCallback.java +++ b/wifi/java/android/net/wifi/aware/AttachCallback.java @@ -21,8 +21,6 @@ package android.net.wifi.aware; * {@link WifiAwareManager#attach(AttachCallback, android.os.Handler)}. These are callbacks * applying to the Aware connection as a whole - not to specific publish or subscribe sessions - * for that see {@link DiscoverySessionCallback}. - * - * @hide PROPOSED_AWARE_API */ public class AttachCallback { /** diff --git a/wifi/java/android/net/wifi/aware/Characteristics.java b/wifi/java/android/net/wifi/aware/Characteristics.java index 1c3e390254390..70474fdc25543 100644 --- a/wifi/java/android/net/wifi/aware/Characteristics.java +++ b/wifi/java/android/net/wifi/aware/Characteristics.java @@ -22,10 +22,8 @@ import android.os.Parcelable; /** * The characteristics of the Wi-Fi Aware implementation. - * - * @hide PROPOSED_AWARE_API */ -public class Characteristics implements Parcelable { +public final class Characteristics implements Parcelable { /** @hide */ public static final String KEY_MAX_SERVICE_NAME_LENGTH = "key_max_service_name_length"; /** @hide */ diff --git a/wifi/java/android/net/wifi/aware/DiscoverySession.java b/wifi/java/android/net/wifi/aware/DiscoverySession.java index c89718f8b1329..adf189b64544d 100644 --- a/wifi/java/android/net/wifi/aware/DiscoverySession.java +++ b/wifi/java/android/net/wifi/aware/DiscoverySession.java @@ -18,7 +18,6 @@ package android.net.wifi.aware; import android.annotation.NonNull; import android.annotation.Nullable; -import android.annotation.SystemApi; import android.net.wifi.RttManager; import android.util.Log; @@ -39,8 +38,6 @@ import java.lang.ref.WeakReference; * * The {@link #destroy()} method must be called to destroy discovery sessions once they are * no longer needed. - * - * @hide PROPOSED_AWARE_API */ public class DiscoverySession { private static final String TAG = "DiscoverySession"; @@ -230,7 +227,7 @@ public class DiscoverySession { * {@link android.net.wifi.RttManager.RttParams#bssid} member must be set to * a peer ID - not to a MAC address. * @param listener The listener to receive the results of the ranging session. - * @hide PROPOSED_AWARE_SYSTEM_API + * @hide * [TODO: b/28847998 - track RTT API & visilibity] */ public void startRanging(RttManager.RttParams[] params, RttManager.RttListener listener) { diff --git a/wifi/java/android/net/wifi/aware/DiscoverySessionCallback.java b/wifi/java/android/net/wifi/aware/DiscoverySessionCallback.java index 1fe449fc11154..33da1823c8b80 100644 --- a/wifi/java/android/net/wifi/aware/DiscoverySessionCallback.java +++ b/wifi/java/android/net/wifi/aware/DiscoverySessionCallback.java @@ -30,8 +30,6 @@ import java.util.List; * android.os.Handler)}. *

* A single callback is set at session creation - it cannot be replaced. - * - * @hide PROPOSED_AWARE_API */ public class DiscoverySessionCallback { /** diff --git a/wifi/java/android/net/wifi/aware/IdentityChangedListener.java b/wifi/java/android/net/wifi/aware/IdentityChangedListener.java index b0f97bda0339d..cae8706933dca 100644 --- a/wifi/java/android/net/wifi/aware/IdentityChangedListener.java +++ b/wifi/java/android/net/wifi/aware/IdentityChangedListener.java @@ -25,8 +25,6 @@ package android.net.wifi.aware; * interface may also be useful if the application uses alternative (non-Aware) discovery but needs * to set up a Aware connection. The provided Aware discovery interface MAC address can then be used * in {@link WifiAwareSession#createNetworkSpecifier(int, byte[], byte[])}. - * - * @hide PROPOSED_AWARE_API */ public class IdentityChangedListener { /** diff --git a/wifi/java/android/net/wifi/aware/PeerHandle.java b/wifi/java/android/net/wifi/aware/PeerHandle.java index 777d9a376fdf0..bbe9f5451713c 100644 --- a/wifi/java/android/net/wifi/aware/PeerHandle.java +++ b/wifi/java/android/net/wifi/aware/PeerHandle.java @@ -22,8 +22,6 @@ package android.net.wifi.aware; * when sending messages e,g, {@link PublishDiscoverySession#sendMessage(PeerHandle, int, byte[])}, * or when configuring a network link to a peer, e.g. * {@link PublishDiscoverySession#createNetworkSpecifier(PeerHandle, byte[])}. - * - * @hide PROPOSED_AWARE_API */ public class PeerHandle { /** @hide */ diff --git a/wifi/java/android/net/wifi/aware/PublishConfig.java b/wifi/java/android/net/wifi/aware/PublishConfig.java index 1b8ef8431f194..a996844883b0c 100644 --- a/wifi/java/android/net/wifi/aware/PublishConfig.java +++ b/wifi/java/android/net/wifi/aware/PublishConfig.java @@ -36,8 +36,6 @@ import java.util.List; * {@link WifiAwareSession#publish(PublishConfig, DiscoverySessionCallback, * android.os.Handler)} or updated using * {@link PublishDiscoverySession#updatePublish(PublishConfig)}. - * - * @hide PROPOSED_AWARE_API */ public final class PublishConfig implements Parcelable { /** @hide */ diff --git a/wifi/java/android/net/wifi/aware/PublishDiscoverySession.java b/wifi/java/android/net/wifi/aware/PublishDiscoverySession.java index f2355b382e8d9..1c99c87195a9f 100644 --- a/wifi/java/android/net/wifi/aware/PublishDiscoverySession.java +++ b/wifi/java/android/net/wifi/aware/PublishDiscoverySession.java @@ -27,8 +27,6 @@ import android.util.Log; * baseline functionality of all discovery sessions in {@link DiscoverySession}. This * object allows updating an existing/running publish discovery session using * {@link #updatePublish(PublishConfig)}. - * - * @hide PROPOSED_AWARE_API */ public class PublishDiscoverySession extends DiscoverySession { private static final String TAG = "PublishDiscoverySession"; diff --git a/wifi/java/android/net/wifi/aware/SubscribeConfig.java b/wifi/java/android/net/wifi/aware/SubscribeConfig.java index a54a4f5f51316..3397c4bc2ac37 100644 --- a/wifi/java/android/net/wifi/aware/SubscribeConfig.java +++ b/wifi/java/android/net/wifi/aware/SubscribeConfig.java @@ -36,8 +36,6 @@ import java.util.List; * {@link WifiAwareSession#subscribe(SubscribeConfig, DiscoverySessionCallback, * android.os.Handler)} or * {@link SubscribeDiscoverySession#updateSubscribe(SubscribeConfig)}. - * - * @hide PROPOSED_AWARE_API */ public final class SubscribeConfig implements Parcelable { /** @hide */ diff --git a/wifi/java/android/net/wifi/aware/SubscribeDiscoverySession.java b/wifi/java/android/net/wifi/aware/SubscribeDiscoverySession.java index 39db1c715ae20..ca88a908cdbd2 100644 --- a/wifi/java/android/net/wifi/aware/SubscribeDiscoverySession.java +++ b/wifi/java/android/net/wifi/aware/SubscribeDiscoverySession.java @@ -28,8 +28,6 @@ import android.util.Log; * See baseline functionality of all discovery sessions in {@link DiscoverySession}. * This object allows updating an existing/running subscribe discovery session using * {@link #updateSubscribe(SubscribeConfig)}. - * - * @hide PROPOSED_AWARE_API */ public class SubscribeDiscoverySession extends DiscoverySession { private static final String TAG = "SubscribeDiscSession"; diff --git a/wifi/java/android/net/wifi/aware/WifiAwareManager.java b/wifi/java/android/net/wifi/aware/WifiAwareManager.java index 8c0a3a091579a..043925edc5f02 100644 --- a/wifi/java/android/net/wifi/aware/WifiAwareManager.java +++ b/wifi/java/android/net/wifi/aware/WifiAwareManager.java @@ -118,8 +118,6 @@ import java.util.List; * {@link WifiAwareSession#createNetworkSpecifier(int, byte[], byte[])} or * {@link DiscoverySession#createNetworkSpecifier(PeerHandle, byte[])}. * - * - * @hide PROPOSED_AWARE_API */ public class WifiAwareManager { private static final String TAG = "WifiAwareManager"; @@ -305,7 +303,6 @@ 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 Characteristics getCharacteristics() { try { diff --git a/wifi/java/android/net/wifi/aware/WifiAwareSession.java b/wifi/java/android/net/wifi/aware/WifiAwareSession.java index e3ebe860f55f4..86969200bc461 100644 --- a/wifi/java/android/net/wifi/aware/WifiAwareSession.java +++ b/wifi/java/android/net/wifi/aware/WifiAwareSession.java @@ -30,8 +30,6 @@ import java.lang.ref.WeakReference; /** * This class represents a Wi-Fi Aware session - an attachment to the Wi-Fi Aware service through * which the app can execute discovery operations. - * - * @hide PROPOSED_AWARE_API */ public class WifiAwareSession { private static final String TAG = "WifiAwareSession"; diff --git a/wifi/java/android/net/wifi/aware/package.html b/wifi/java/android/net/wifi/aware/package.html index 1a990d8e93b7a..d5d962f629ded 100644 --- a/wifi/java/android/net/wifi/aware/package.html +++ b/wifi/java/android/net/wifi/aware/package.html @@ -23,7 +23,7 @@ If your application only works with Wi-Fi Aware (i.e. it should only be installed on devices which support Wi-Fi Aware), declare so with a - {@code <uses-feature>} + {@code } element in the manifest file:

 <manifest ...>