Merge "[AWARE] Unhide Wi-Fi Aware API (baseline)" (dfe8f5dc) · Commits · e / os / android_frameworks_base

api/current.txt

+119 −0

Original line number	Diff line number	Diff line
		@@ -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 {

api/system-current.txt

+119 −0

Original line number	Diff line number	Diff line
		@@ -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 {

api/test-current.txt

+119 −0

Original line number	Diff line number	Diff line
		@@ -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 {

core/java/android/content/Context.java

+3 −1

Original line number	Diff line number	Diff line
		@@ -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";

core/java/android/content/pm/PackageManager.java

+0 −2

Original line number	Diff line number	Diff line
		@@ -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";