Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[AWARE] Unhide Wi-Fi Aware API (baseline)"

Browse Source
This commit is contained in:
Etan Cohen
2017-01-11 22:59:24 +00:00
committed by Gerrit Code Review
parent b5488ec3b3 6a4b323f08
commit dfe8f5dc13
19 changed files with 363 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

119
api/current.txt
View File

@@ -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<android.net.wifi.aware.Characteristics> 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<byte[]>);
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<android.net.wifi.aware.PublishConfig> 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<byte[]>);
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<android.net.wifi.aware.SubscribeConfig> 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<byte[]>);
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 {

119
api/system-current.txt
View File

@@ -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<android.net.wifi.aware.Characteristics> 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<byte[]>);
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<android.net.wifi.aware.PublishConfig> 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<byte[]>);
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<android.net.wifi.aware.SubscribeConfig> 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<byte[]>);
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 {

119
api/test-current.txt
View File

@@ -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<android.net.wifi.aware.Characteristics> 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<byte[]>);
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<android.net.wifi.aware.PublishConfig> 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<byte[]>);
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<android.net.wifi.aware.SubscribeConfig> 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<byte[]>);
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 {

4
core/java/android/content/Context.java
View File

@@ -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";

2
core/java/android/content/pm/PackageManager.java
View File

@@ -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";

2
core/java/android/net/NetworkCapabilities.java
View File

@@ -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;

2
wifi/java/android/net/wifi/aware/AttachCallback.java
View File

@@ -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 {
/**

4
wifi/java/android/net/wifi/aware/Characteristics.java
View File

@@ -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 */

5
wifi/java/android/net/wifi/aware/DiscoverySession.java
View File

@@ -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;
* </ul>
* 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) {

2
wifi/java/android/net/wifi/aware/DiscoverySessionCallback.java
View File

@@ -30,8 +30,6 @@ import java.util.List;
* android.os.Handler)}.
* <p>
* A single callback is set at session creation - it cannot be replaced.
*
* @hide PROPOSED_AWARE_API
*/
public class DiscoverySessionCallback {
/**

2
wifi/java/android/net/wifi/aware/IdentityChangedListener.java
View File

@@ -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 {
/**

2
wifi/java/android/net/wifi/aware/PeerHandle.java
View File

@@ -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 */

2
wifi/java/android/net/wifi/aware/PublishConfig.java
View File

@@ -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 */

2
wifi/java/android/net/wifi/aware/PublishDiscoverySession.java
View File

@@ -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";

2
wifi/java/android/net/wifi/aware/SubscribeConfig.java
View File

@@ -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 */

2
wifi/java/android/net/wifi/aware/SubscribeDiscoverySession.java
View File

@@ -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";

3
wifi/java/android/net/wifi/aware/WifiAwareManager.java
View File

@@ -118,8 +118,6 @@ import java.util.List;
* {@link WifiAwareSession#createNetworkSpecifier(int, byte[], byte[])} or
* {@link DiscoverySession#createNetworkSpecifier(PeerHandle, byte[])}.
* </ul>
*
* @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 {

2
wifi/java/android/net/wifi/aware/WifiAwareSession.java
View File

@@ -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";

2
wifi/java/android/net/wifi/aware/package.html
View File

@@ -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 <a
href="{@docRoot}guide/topics/manifest/uses-feature-element.html">
{@code &lt;uses-feature&gt;}</a>
{@code <uses-feature>}</a>
element in the manifest file:</p>
<pre>
&lt;manifest ...>