Merge "[AWARE] Remove match style API" into oc-dev am: 2be0a532bf (62dd9594) · Commits · e / os / android_frameworks_base

api/current.txt

+0 −3

api/system-current.txt

+0 −3

api/test-current.txt

+0 −3

wifi/java/android/net/wifi/aware/SubscribeConfig.java

+6 −61

Original line number	Original line	Diff line number	Diff line
	@@ -60,27 +60,6 @@ public final class SubscribeConfig implements Parcelable {
	*/		*/
	public static final int SUBSCRIBE_TYPE_ACTIVE = 1;		public static final int SUBSCRIBE_TYPE_ACTIVE = 1;

	/** @hide */
	@IntDef({
	MATCH_STYLE_FIRST_ONLY, MATCH_STYLE_ALL })
	@Retention(RetentionPolicy.SOURCE)
	public @interface MatchStyles {
	}

	/**
	* Specifies that only the first match of a set of identical matches (same
	* publish) will be reported to the subscriber. Configuration is done using
	* {@link SubscribeConfig.Builder#setMatchStyle(int)}.
	*/
	public static final int MATCH_STYLE_FIRST_ONLY = 0;

	/**
	* Specifies that all matches of a set of identical matches (same publish)
	* will be reported to the subscriber. Configuration is done using
	* {@link SubscribeConfig.Builder#setMatchStyle(int)}.
	*/
	public static final int MATCH_STYLE_ALL = 1;

	/** @hide */		/** @hide */
	public final byte[] mServiceName;		public final byte[] mServiceName;

	@@ -96,22 +75,18 @@ public final class SubscribeConfig implements Parcelable {
	/** @hide */		/** @hide */
	public final int mTtlSec;		public final int mTtlSec;

	/** @hide */
	public final int mMatchStyle;

	/** @hide */		/** @hide */
	public final boolean mEnableTerminateNotification;		public final boolean mEnableTerminateNotification;

	/** @hide */		/** @hide */
	public SubscribeConfig(byte[] serviceName, byte[] serviceSpecificInfo, byte[] matchFilter,		public SubscribeConfig(byte[] serviceName, byte[] serviceSpecificInfo, byte[] matchFilter,
	int subscribeType, int ttlSec, int matchStyle,		int subscribeType, int ttlSec,
	boolean enableTerminateNotification) {		boolean enableTerminateNotification) {
	mServiceName = serviceName;		mServiceName = serviceName;
	mServiceSpecificInfo = serviceSpecificInfo;		mServiceSpecificInfo = serviceSpecificInfo;
	mMatchFilter = matchFilter;		mMatchFilter = matchFilter;
	mSubscribeType = subscribeType;		mSubscribeType = subscribeType;
	mTtlSec = ttlSec;		mTtlSec = ttlSec;
	mMatchStyle = matchStyle;
	mEnableTerminateNotification = enableTerminateNotification;		mEnableTerminateNotification = enableTerminateNotification;
	}		}

	@@ -121,8 +96,8 @@ public final class SubscribeConfig implements Parcelable {
	(mServiceSpecificInfo == null) ? "null" : HexEncoding.encode(mServiceSpecificInfo))		(mServiceSpecificInfo == null) ? "null" : HexEncoding.encode(mServiceSpecificInfo))
	+ ", mMatchFilter=" + (new TlvBufferUtils.TlvIterable(0, 1,		+ ", mMatchFilter=" + (new TlvBufferUtils.TlvIterable(0, 1,
	mMatchFilter)).toString() + ", mSubscribeType=" + mSubscribeType		mMatchFilter)).toString() + ", mSubscribeType=" + mSubscribeType
	+ ", mTtlSec=" + mTtlSec + ", mMatchType="		+ ", mTtlSec=" + mTtlSec
	+ mMatchStyle + ", mEnableTerminateNotification=" + mEnableTerminateNotification		+ ", mEnableTerminateNotification=" + mEnableTerminateNotification
	+ "]";		+ "]";
	}		}

	@@ -138,7 +113,6 @@ public final class SubscribeConfig implements Parcelable {
	dest.writeByteArray(mMatchFilter);		dest.writeByteArray(mMatchFilter);
	dest.writeInt(mSubscribeType);		dest.writeInt(mSubscribeType);
	dest.writeInt(mTtlSec);		dest.writeInt(mTtlSec);
	dest.writeInt(mMatchStyle);
	dest.writeInt(mEnableTerminateNotification ? 1 : 0);		dest.writeInt(mEnableTerminateNotification ? 1 : 0);
	}		}

	@@ -155,11 +129,10 @@ public final class SubscribeConfig implements Parcelable {
	byte[] matchFilter = in.createByteArray();		byte[] matchFilter = in.createByteArray();
	int subscribeType = in.readInt();		int subscribeType = in.readInt();
	int ttlSec = in.readInt();		int ttlSec = in.readInt();
	int matchStyle = in.readInt();
	boolean enableTerminateNotification = in.readInt() != 0;		boolean enableTerminateNotification = in.readInt() != 0;

	return new SubscribeConfig(serviceName, ssi, matchFilter, subscribeType,		return new SubscribeConfig(serviceName, ssi, matchFilter, subscribeType,
	ttlSec, matchStyle, enableTerminateNotification);		ttlSec, enableTerminateNotification);
	}		}
	};		};

	@@ -178,7 +151,7 @@ public final class SubscribeConfig implements Parcelable {
	return Arrays.equals(mServiceName, lhs.mServiceName) && Arrays.equals(mServiceSpecificInfo,		return Arrays.equals(mServiceName, lhs.mServiceName) && Arrays.equals(mServiceSpecificInfo,
	lhs.mServiceSpecificInfo) && Arrays.equals(mMatchFilter, lhs.mMatchFilter)		lhs.mServiceSpecificInfo) && Arrays.equals(mMatchFilter, lhs.mMatchFilter)
	&& mSubscribeType == lhs.mSubscribeType		&& mSubscribeType == lhs.mSubscribeType
	&& mTtlSec == lhs.mTtlSec && mMatchStyle == lhs.mMatchStyle		&& mTtlSec == lhs.mTtlSec
	&& mEnableTerminateNotification == lhs.mEnableTerminateNotification;		&& mEnableTerminateNotification == lhs.mEnableTerminateNotification;
	}		}

	@@ -191,7 +164,6 @@ public final class SubscribeConfig implements Parcelable {
	result = 31 * result + Arrays.hashCode(mMatchFilter);		result = 31 * result + Arrays.hashCode(mMatchFilter);
	result = 31 * result + mSubscribeType;		result = 31 * result + mSubscribeType;
	result = 31 * result + mTtlSec;		result = 31 * result + mTtlSec;
	result = 31 * result + mMatchStyle;
	result = 31 * result + (mEnableTerminateNotification ? 1 : 0);		result = 31 * result + (mEnableTerminateNotification ? 1 : 0);

	return result;		return result;
	@@ -217,10 +189,6 @@ public final class SubscribeConfig implements Parcelable {
	if (mTtlSec < 0) {		if (mTtlSec < 0) {
	throw new IllegalArgumentException("Invalid ttlSec - must be non-negative");		throw new IllegalArgumentException("Invalid ttlSec - must be non-negative");
	}		}
	if (mMatchStyle != MATCH_STYLE_FIRST_ONLY && mMatchStyle != MATCH_STYLE_ALL) {
	throw new IllegalArgumentException(
	"Invalid matchType - must be MATCH_FIRST_ONLY or MATCH_ALL");
	}

	if (characteristics != null) {		if (characteristics != null) {
	int maxServiceNameLength = characteristics.getMaxServiceNameLength();		int maxServiceNameLength = characteristics.getMaxServiceNameLength();
	@@ -252,7 +220,6 @@ public final class SubscribeConfig implements Parcelable {
	private byte[] mMatchFilter;		private byte[] mMatchFilter;
	private int mSubscribeType = SUBSCRIBE_TYPE_PASSIVE;		private int mSubscribeType = SUBSCRIBE_TYPE_PASSIVE;
	private int mTtlSec = 0;		private int mTtlSec = 0;
	private int mMatchStyle = MATCH_STYLE_ALL;
	private boolean mEnableTerminateNotification = true;		private boolean mEnableTerminateNotification = true;

	/**		/**
	@@ -362,28 +329,6 @@ public final class SubscribeConfig implements Parcelable {
	return this;		return this;
	}		}

	/**
	* Sets the match style of the subscription - how are matches from a
	* single match session (corresponding to the same publish action on the
	* peer) reported to the host (using the
	* {@link DiscoverySessionCallback#onServiceDiscovered(PeerHandle, byte[],
	* java.util.List)}). The options are: only report the first match and ignore the rest
	* {@link SubscribeConfig#MATCH_STYLE_FIRST_ONLY} or report every single
	* match {@link SubscribeConfig#MATCH_STYLE_ALL} (the default).
	*
	* @param matchStyle The reporting style for the discovery match.
	* @return The builder to facilitate chaining
	* {@code builder.setXXX(..).setXXX(..)}.
	*/
	public Builder setMatchStyle(@MatchStyles int matchStyle) {
	if (matchStyle != MATCH_STYLE_FIRST_ONLY && matchStyle != MATCH_STYLE_ALL) {
	throw new IllegalArgumentException(
	"Invalid matchType - must be MATCH_FIRST_ONLY or MATCH_ALL");
	}
	mMatchStyle = matchStyle;
	return this;
	}

	/**		/**
	* Configure whether a subscribe terminate notification		* Configure whether a subscribe terminate notification
	* {@link DiscoverySessionCallback#onSessionTerminated()} is reported		* {@link DiscoverySessionCallback#onSessionTerminated()} is reported
	@@ -406,7 +351,7 @@ public final class SubscribeConfig implements Parcelable {
	*/		*/
	public SubscribeConfig build() {		public SubscribeConfig build() {
	return new SubscribeConfig(mServiceName, mServiceSpecificInfo, mMatchFilter,		return new SubscribeConfig(mServiceName, mServiceSpecificInfo, mMatchFilter,
	mSubscribeType, mTtlSec, mMatchStyle,		mSubscribeType, mTtlSec,
	mEnableTerminateNotification);		mEnableTerminateNotification);
	}		}
	}		}

wifi/tests/src/android/net/wifi/aware/WifiAwareManagerTest.java

+2 −16

Original line number	Original line	Diff line number	Diff line
	@@ -26798,8 +26798,6 @@ package android.net.wifi.aware {
	method public int describeContents();		method public int describeContents();
	method public void writeToParcel(android.os.Parcel, int);		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 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_ACTIVE = 1; // 0x1
	field public static final int SUBSCRIBE_TYPE_PASSIVE = 0; // 0x0		field public static final int SUBSCRIBE_TYPE_PASSIVE = 0; // 0x0
	}		}
	@@ -26808,7 +26806,6 @@ package android.net.wifi.aware {
	ctor public SubscribeConfig.Builder();		ctor public SubscribeConfig.Builder();
	method public android.net.wifi.aware.SubscribeConfig build();		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 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 setServiceName(java.lang.String);
	method public android.net.wifi.aware.SubscribeConfig.Builder setServiceSpecificInfo(byte[]);		method public android.net.wifi.aware.SubscribeConfig.Builder setServiceSpecificInfo(byte[]);
	method public android.net.wifi.aware.SubscribeConfig.Builder setSubscribeType(int);		method public android.net.wifi.aware.SubscribeConfig.Builder setSubscribeType(int);

Original line number	Original line	Diff line number	Diff line
	@@ -29543,8 +29543,6 @@ package android.net.wifi.aware {
	method public int describeContents();		method public int describeContents();
	method public void writeToParcel(android.os.Parcel, int);		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 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_ACTIVE = 1; // 0x1
	field public static final int SUBSCRIBE_TYPE_PASSIVE = 0; // 0x0		field public static final int SUBSCRIBE_TYPE_PASSIVE = 0; // 0x0
	}		}
	@@ -29553,7 +29551,6 @@ package android.net.wifi.aware {
	ctor public SubscribeConfig.Builder();		ctor public SubscribeConfig.Builder();
	method public android.net.wifi.aware.SubscribeConfig build();		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 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 setServiceName(java.lang.String);
	method public android.net.wifi.aware.SubscribeConfig.Builder setServiceSpecificInfo(byte[]);		method public android.net.wifi.aware.SubscribeConfig.Builder setServiceSpecificInfo(byte[]);
	method public android.net.wifi.aware.SubscribeConfig.Builder setSubscribeType(int);		method public android.net.wifi.aware.SubscribeConfig.Builder setSubscribeType(int);

Original line number	Original line	Diff line number	Diff line
	@@ -26906,8 +26906,6 @@ package android.net.wifi.aware {
	method public int describeContents();		method public int describeContents();
	method public void writeToParcel(android.os.Parcel, int);		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 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_ACTIVE = 1; // 0x1
	field public static final int SUBSCRIBE_TYPE_PASSIVE = 0; // 0x0		field public static final int SUBSCRIBE_TYPE_PASSIVE = 0; // 0x0
	}		}
	@@ -26916,7 +26914,6 @@ package android.net.wifi.aware {
	ctor public SubscribeConfig.Builder();		ctor public SubscribeConfig.Builder();
	method public android.net.wifi.aware.SubscribeConfig build();		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 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 setServiceName(java.lang.String);
	method public android.net.wifi.aware.SubscribeConfig.Builder setServiceSpecificInfo(byte[]);		method public android.net.wifi.aware.SubscribeConfig.Builder setServiceSpecificInfo(byte[]);
	method public android.net.wifi.aware.SubscribeConfig.Builder setSubscribeType(int);		method public android.net.wifi.aware.SubscribeConfig.Builder setSubscribeType(int);

Original line number	Original line	Diff line number	Diff line
	@@ -687,8 +687,6 @@ public class WifiAwareManagerTest {
	collector.checkThat("mSubscribeType", subscribeConfig.mSubscribeType,		collector.checkThat("mSubscribeType", subscribeConfig.mSubscribeType,
	equalTo(SubscribeConfig.SUBSCRIBE_TYPE_PASSIVE));		equalTo(SubscribeConfig.SUBSCRIBE_TYPE_PASSIVE));
	collector.checkThat("mTtlSec", subscribeConfig.mTtlSec, equalTo(0));		collector.checkThat("mTtlSec", subscribeConfig.mTtlSec, equalTo(0));
	collector.checkThat("mMatchStyle", subscribeConfig.mMatchStyle,
	equalTo(SubscribeConfig.MATCH_STYLE_ALL));
	collector.checkThat("mEnableTerminateNotification",		collector.checkThat("mEnableTerminateNotification",
	subscribeConfig.mEnableTerminateNotification, equalTo(true));		subscribeConfig.mEnableTerminateNotification, equalTo(true));
	}		}
	@@ -701,14 +699,13 @@ public class WifiAwareManagerTest {
	final int subscribeType = SubscribeConfig.SUBSCRIBE_TYPE_PASSIVE;		final int subscribeType = SubscribeConfig.SUBSCRIBE_TYPE_PASSIVE;
	final int subscribeCount = 10;		final int subscribeCount = 10;
	final int subscribeTtl = 15;		final int subscribeTtl = 15;
	final int matchStyle = SubscribeConfig.MATCH_STYLE_FIRST_ONLY;
	final boolean enableTerminateNotification = false;		final boolean enableTerminateNotification = false;

	SubscribeConfig subscribeConfig = new SubscribeConfig.Builder().setServiceName(serviceName)		SubscribeConfig subscribeConfig = new SubscribeConfig.Builder().setServiceName(serviceName)
	.setServiceSpecificInfo(serviceSpecificInfo.getBytes()).setMatchFilter(		.setServiceSpecificInfo(serviceSpecificInfo.getBytes()).setMatchFilter(
	new TlvBufferUtils.TlvIterable(0, 1, matchFilter).toList())		new TlvBufferUtils.TlvIterable(0, 1, matchFilter).toList())
	.setSubscribeType(subscribeType)		.setSubscribeType(subscribeType)
	.setTtlSec(subscribeTtl).setMatchStyle(matchStyle)		.setTtlSec(subscribeTtl)
	.setTerminateNotificationEnabled(enableTerminateNotification).build();		.setTerminateNotificationEnabled(enableTerminateNotification).build();

	collector.checkThat("mServiceName", serviceName.getBytes(),		collector.checkThat("mServiceName", serviceName.getBytes(),
	@@ -719,7 +716,6 @@ public class WifiAwareManagerTest {
	collector.checkThat("mSubscribeType", subscribeType,		collector.checkThat("mSubscribeType", subscribeType,
	equalTo(subscribeConfig.mSubscribeType));		equalTo(subscribeConfig.mSubscribeType));
	collector.checkThat("mTtlSec", subscribeTtl, equalTo(subscribeConfig.mTtlSec));		collector.checkThat("mTtlSec", subscribeTtl, equalTo(subscribeConfig.mTtlSec));
	collector.checkThat("mMatchStyle", matchStyle, equalTo(subscribeConfig.mMatchStyle));
	collector.checkThat("mEnableTerminateNotification", enableTerminateNotification,		collector.checkThat("mEnableTerminateNotification", enableTerminateNotification,
	equalTo(subscribeConfig.mEnableTerminateNotification));		equalTo(subscribeConfig.mEnableTerminateNotification));
	}		}
	@@ -730,16 +726,14 @@ public class WifiAwareManagerTest {
	final String serviceSpecificInfo = "long arbitrary string with some info";		final String serviceSpecificInfo = "long arbitrary string with some info";
	final byte[] matchFilter = { 1, 16, 1, 22 };		final byte[] matchFilter = { 1, 16, 1, 22 };
	final int subscribeType = SubscribeConfig.SUBSCRIBE_TYPE_PASSIVE;		final int subscribeType = SubscribeConfig.SUBSCRIBE_TYPE_PASSIVE;
	final int subscribeCount = 10;
	final int subscribeTtl = 15;		final int subscribeTtl = 15;
	final int matchStyle = SubscribeConfig.MATCH_STYLE_FIRST_ONLY;
	final boolean enableTerminateNotification = true;		final boolean enableTerminateNotification = true;