[NAN] Simplify publish/subscribe configuration - merge match filters (0153a745) · Commits · e / os / android_frameworks_base

wifi/java/android/net/wifi/nan/PublishConfig.java

+22 −72

Original line number	Diff line number	Diff line
		@@ -69,10 +69,7 @@ public class PublishConfig implements Parcelable {
		public final byte[] mServiceSpecificInfo;

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

		/** @hide */
		public final byte[] mRxFilter;
		public final byte[] mMatchFilter;

		/** @hide */
		public final int mPublishType;
		@@ -86,13 +83,11 @@ public class PublishConfig implements Parcelable {
		/** @hide */
		public final boolean mEnableTerminateNotification;

		private PublishConfig(byte[] serviceName, byte[] serviceSpecificInfo,
		byte[] txFilter, byte[] rxFilter, int publishType, int publichCount, int ttlSec,
		boolean enableTerminateNotification) {
		private PublishConfig(byte[] serviceName, byte[] serviceSpecificInfo, byte[] matchFilter,
		int publishType, int publichCount, int ttlSec, boolean enableTerminateNotification) {
		mServiceName = serviceName;
		mServiceSpecificInfo = serviceSpecificInfo;
		mTxFilter = txFilter;
		mRxFilter = rxFilter;
		mMatchFilter = matchFilter;
		mPublishType = publishType;
		mPublishCount = publichCount;
		mTtlSec = ttlSec;
		@@ -103,8 +98,7 @@ public class PublishConfig implements Parcelable {
		public String toString() {
		return "PublishConfig [mServiceName='" + mServiceName + ", mServiceSpecificInfo='" + (
		(mServiceSpecificInfo == null) ? "null" : HexEncoding.encode(mServiceSpecificInfo))
		+ ", mTxFilter=" + (new LvBufferUtils.LvIterable(1, mTxFilter)).toString()
		+ ", mRxFilter=" + (new LvBufferUtils.LvIterable(1, mRxFilter)).toString()
		+ ", mTxFilter=" + (new LvBufferUtils.LvIterable(1, mMatchFilter)).toString()
		+ ", mPublishType=" + mPublishType + ", mPublishCount=" + mPublishCount
		+ ", mTtlSec=" + mTtlSec + ", mEnableTerminateNotification="
		+ mEnableTerminateNotification + "]";
		@@ -119,8 +113,7 @@ public class PublishConfig implements Parcelable {
		public void writeToParcel(Parcel dest, int flags) {
		dest.writeByteArray(mServiceName);
		dest.writeByteArray(mServiceSpecificInfo);
		dest.writeByteArray(mTxFilter);
		dest.writeByteArray(mRxFilter);
		dest.writeByteArray(mMatchFilter);
		dest.writeInt(mPublishType);
		dest.writeInt(mPublishCount);
		dest.writeInt(mTtlSec);
		@@ -137,15 +130,14 @@ public class PublishConfig implements Parcelable {
		public PublishConfig createFromParcel(Parcel in) {
		byte[] serviceName = in.createByteArray();
		byte[] ssi = in.createByteArray();
		byte[] txFilter = in.createByteArray();
		byte[] rxFilter = in.createByteArray();
		byte[] matchFilter = in.createByteArray();
		int publishType = in.readInt();
		int publishCount = in.readInt();
		int ttlSec = in.readInt();
		boolean enableTerminateNotification = in.readInt() != 0;

		return new PublishConfig(serviceName, ssi, txFilter, rxFilter, publishType,
		publishCount, ttlSec, enableTerminateNotification);
		return new PublishConfig(serviceName, ssi, matchFilter, publishType, publishCount,
		ttlSec, enableTerminateNotification);
		}
		};

		@@ -162,9 +154,9 @@ public class PublishConfig implements Parcelable {
		PublishConfig lhs = (PublishConfig) o;

		return Arrays.equals(mServiceName, lhs.mServiceName) && Arrays.equals(mServiceSpecificInfo,
		lhs.mServiceSpecificInfo) && Arrays.equals(mTxFilter, lhs.mTxFilter)
		&& Arrays.equals(mRxFilter, lhs.mRxFilter) && mPublishType == lhs.mPublishType
		&& mPublishCount == lhs.mPublishCount && mTtlSec == lhs.mTtlSec
		lhs.mServiceSpecificInfo) && Arrays.equals(mMatchFilter, lhs.mMatchFilter)
		&& mPublishType == lhs.mPublishType && mPublishCount == lhs.mPublishCount
		&& mTtlSec == lhs.mTtlSec
		&& mEnableTerminateNotification == lhs.mEnableTerminateNotification;
		}

		@@ -174,8 +166,7 @@ public class PublishConfig implements Parcelable {

		result = 31 * result + Arrays.hashCode(mServiceName);
		result = 31 * result + Arrays.hashCode(mServiceSpecificInfo);
		result = 31 * result + Arrays.hashCode(mTxFilter);
		result = 31 * result + Arrays.hashCode(mRxFilter);
		result = 31 * result + Arrays.hashCode(mMatchFilter);
		result = 31 * result + mPublishType;
		result = 31 * result + mPublishCount;
		result = 31 * result + mTtlSec;
		@@ -193,14 +184,10 @@ public class PublishConfig implements Parcelable {
		public void validate() throws IllegalArgumentException {
		WifiNanUtils.validateServiceName(mServiceName);

		if (!LvBufferUtils.isValid(mTxFilter, 1)) {
		if (!LvBufferUtils.isValid(mMatchFilter, 1)) {
		throw new IllegalArgumentException(
		"Invalid txFilter configuration - LV fields do not match up to length");
		}
		if (!LvBufferUtils.isValid(mRxFilter, 1)) {
		throw new IllegalArgumentException(
		"Invalid rxFilter configuration - LV fields do not match up to length");
		}
		if (mPublishType < PUBLISH_TYPE_UNSOLICITED \|\| mPublishType > PUBLISH_TYPE_SOLICITED) {
		throw new IllegalArgumentException("Invalid publishType - " + mPublishType);
		}
		@@ -210,16 +197,6 @@ public class PublishConfig implements Parcelable {
		if (mTtlSec < 0) {
		throw new IllegalArgumentException("Invalid ttlSec - must be non-negative");
		}
		if (mPublishType == PublishConfig.PUBLISH_TYPE_UNSOLICITED && mRxFilter != null
		&& mRxFilter.length != 0) {
		throw new IllegalArgumentException("Invalid publish config: UNSOLICITED "
		+ "publishes (active) can't have an Rx filter");
		}
		if (mPublishType == PublishConfig.PUBLISH_TYPE_SOLICITED && mTxFilter != null
		&& mTxFilter.length != 0) {
		throw new IllegalArgumentException("Invalid publish config: SOLICITED "
		+ "publishes (passive) can't have a Tx filter");
		}
		}

		/**
		@@ -228,8 +205,7 @@ public class PublishConfig implements Parcelable {
		public static final class Builder {
		private byte[] mServiceName;
		private byte[] mServiceSpecificInfo;
		private byte[] mTxFilter;
		private byte[] mRxFilter;
		private byte[] mMatchFilter;
		private int mPublishType = PUBLISH_TYPE_UNSOLICITED;
		private int mPublishCount = 0;
		private int mTtlSec = 0;
		@@ -299,47 +275,21 @@ public class PublishConfig implements Parcelable {
		}

		/**
		* Specify the transmit filter for an active publish session
		* {@link PublishConfig.Builder#setPublishType(int)} and
		* {@link PublishConfig#PUBLISH_TYPE_UNSOLICITED}. Used to determine discovery - both
		* Service Name and filters have to match for discovery to be triggered.
		* <p>
		* Format is an LV byte array: a single byte Length field followed by L bytes (the value of
		* the Length field) of a value blob.
		* </p>
		* <p>
		* Optional. Empty by default.
		* </p>
		*
		* @param txFilter The byte-array containing the LV formatted transmit filter.
		*
		* @return The builder to facilitate chaining
		* {@code builder.setXXX(..).setXXX(..)}.
		*/
		public Builder setTxFilter(@Nullable byte[] txFilter) {
		mTxFilter = txFilter;
		return this;
		}

		/**
		* Specify the receive filter for a passive publish session
		* {@link PublishConfig.Builder#setPublishType(int)} and
		* {@link PublishConfig#PUBLISH_TYPE_SOLICITED}. Used to determine discovery - both
		* Service Name and filters have to match for discovery to be triggered.
		* The match filter for a publish session. Used to determine whether a service
		* discovery occurred - in addition to relying on the service name.
		* <p>
		* Format is an LV byte array: a single byte Length field followed by L bytes (the value of
		* the Length field) of a value blob.
		* <p>
		* Optional. Empty by default.
		*
		* @param rxFilter The byte-array containing the LV formatted receive
		* filter.
		* @param matchFilter The byte-array containing the LV formatted match filter.
		*
		* @return The builder to facilitate chaining
		* {@code builder.setXXX(..).setXXX(..)}.
		*/
		public Builder setRxFilter(@Nullable byte[] rxFilter) {
		mRxFilter = rxFilter;
		public Builder setMatchFilter(@Nullable byte[] matchFilter) {
		mMatchFilter = matchFilter;
		return this;
		}

		@@ -434,8 +384,8 @@ public class PublishConfig implements Parcelable {
		* builder.
		*/
		public PublishConfig build() {
		return new PublishConfig(mServiceName, mServiceSpecificInfo, mTxFilter, mRxFilter,
		mPublishType, mPublishCount, mTtlSec, mEnableTerminateNotification);
		return new PublishConfig(mServiceName, mServiceSpecificInfo, mMatchFilter, mPublishType,
		mPublishCount, mTtlSec, mEnableTerminateNotification);
		}
		}
		}

wifi/java/android/net/wifi/nan/SubscribeConfig.java

+22 −76

Original line number	Diff line number	Diff line
		@@ -88,10 +88,7 @@ public class SubscribeConfig implements Parcelable {
		public final byte[] mServiceSpecificInfo;

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

		/** @hide */
		public final byte[] mRxFilter;
		public final byte[] mMatchFilter;

		/** @hide */
		public final int mSubscribeType;
		@@ -108,13 +105,12 @@ public class SubscribeConfig implements Parcelable {
		/** @hide */
		public final boolean mEnableTerminateNotification;

		private SubscribeConfig(byte[] serviceName, byte[] serviceSpecificInfo, byte[] txFilter,
		byte[] rxFilter, int subscribeType, int publichCount, int ttlSec, int matchStyle,
		private SubscribeConfig(byte[] serviceName, byte[] serviceSpecificInfo, byte[] matchFilter,
		int subscribeType, int publichCount, int ttlSec, int matchStyle,
		boolean enableTerminateNotification) {
		mServiceName = serviceName;
		mServiceSpecificInfo = serviceSpecificInfo;
		mTxFilter = txFilter;
		mRxFilter = rxFilter;
		mMatchFilter = matchFilter;
		mSubscribeType = subscribeType;
		mSubscribeCount = publichCount;
		mTtlSec = ttlSec;
		@@ -126,8 +122,7 @@ public class SubscribeConfig implements Parcelable {
		public String toString() {
		return "SubscribeConfig [mServiceName='" + mServiceName + ", mServiceSpecificInfo='" + (
		(mServiceSpecificInfo == null) ? "null" : HexEncoding.encode(mServiceSpecificInfo))
		+ ", mTxFilter=" + (new LvBufferUtils.LvIterable(1, mTxFilter)).toString()
		+ ", mRxFilter=" + (new LvBufferUtils.LvIterable(1, mRxFilter)).toString()
		+ ", mMatchFilter=" + (new LvBufferUtils.LvIterable(1, mMatchFilter)).toString()
		+ ", mSubscribeType=" + mSubscribeType + ", mSubscribeCount=" + mSubscribeCount
		+ ", mTtlSec=" + mTtlSec + ", mMatchType=" + mMatchStyle
		+ ", mEnableTerminateNotification=" + mEnableTerminateNotification + "]";
		@@ -142,8 +137,7 @@ public class SubscribeConfig implements Parcelable {
		public void writeToParcel(Parcel dest, int flags) {
		dest.writeByteArray(mServiceName);
		dest.writeByteArray(mServiceSpecificInfo);
		dest.writeByteArray(mTxFilter);
		dest.writeByteArray(mRxFilter);
		dest.writeByteArray(mMatchFilter);
		dest.writeInt(mSubscribeType);
		dest.writeInt(mSubscribeCount);
		dest.writeInt(mTtlSec);
		@@ -161,16 +155,15 @@ public class SubscribeConfig implements Parcelable {
		public SubscribeConfig createFromParcel(Parcel in) {
		byte[] serviceName = in.createByteArray();
		byte[] ssi = in.createByteArray();
		byte[] txFilter = in.createByteArray();
		byte[] rxFilter = in.createByteArray();
		byte[] matchFilter = in.createByteArray();
		int subscribeType = in.readInt();
		int subscribeCount = in.readInt();
		int ttlSec = in.readInt();
		int matchStyle = in.readInt();
		boolean enableTerminateNotification = in.readInt() != 0;

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

		@@ -187,10 +180,9 @@ public class SubscribeConfig implements Parcelable {
		SubscribeConfig lhs = (SubscribeConfig) o;

		return Arrays.equals(mServiceName, lhs.mServiceName) && Arrays.equals(mServiceSpecificInfo,
		lhs.mServiceSpecificInfo) && Arrays.equals(mTxFilter, lhs.mTxFilter)
		&& Arrays.equals(mRxFilter, lhs.mRxFilter) && mSubscribeType == lhs.mSubscribeType
		&& mSubscribeCount == lhs.mSubscribeCount && mTtlSec == lhs.mTtlSec
		&& mMatchStyle == lhs.mMatchStyle
		lhs.mServiceSpecificInfo) && Arrays.equals(mMatchFilter, lhs.mMatchFilter)
		&& mSubscribeType == lhs.mSubscribeType && mSubscribeCount == lhs.mSubscribeCount
		&& mTtlSec == lhs.mTtlSec && mMatchStyle == lhs.mMatchStyle
		&& mEnableTerminateNotification == lhs.mEnableTerminateNotification;
		}

		@@ -200,8 +192,7 @@ public class SubscribeConfig implements Parcelable {

		result = 31 * result + Arrays.hashCode(mServiceName);
		result = 31 * result + Arrays.hashCode(mServiceSpecificInfo);
		result = 31 * result + Arrays.hashCode(mTxFilter);
		result = 31 * result + Arrays.hashCode(mRxFilter);
		result = 31 * result + Arrays.hashCode(mMatchFilter);
		result = 31 * result + mSubscribeType;
		result = 31 * result + mSubscribeCount;
		result = 31 * result + mTtlSec;
		@@ -220,13 +211,9 @@ public class SubscribeConfig implements Parcelable {
		public void validate() throws IllegalArgumentException {
		WifiNanUtils.validateServiceName(mServiceName);

		if (!LvBufferUtils.isValid(mTxFilter, 1)) {
		throw new IllegalArgumentException(
		"Invalid txFilter configuration - LV fields do not match up to length");
		}
		if (!LvBufferUtils.isValid(mRxFilter, 1)) {
		if (!LvBufferUtils.isValid(mMatchFilter, 1)) {
		throw new IllegalArgumentException(
		"Invalid rxFilter configuration - LV fields do not match up to length");
		"Invalid matchFilter configuration - LV fields do not match up to length");
		}
		if (mSubscribeType < SUBSCRIBE_TYPE_PASSIVE \|\| mSubscribeType > SUBSCRIBE_TYPE_ACTIVE) {
		throw new IllegalArgumentException("Invalid subscribeType - " + mSubscribeType);
		@@ -241,16 +228,6 @@ public class SubscribeConfig implements Parcelable {
		throw new IllegalArgumentException(
		"Invalid matchType - must be MATCH_FIRST_ONLY or MATCH_ALL");
		}
		if (mSubscribeType == SubscribeConfig.SUBSCRIBE_TYPE_ACTIVE && mRxFilter != null
		&& mRxFilter.length != 0) {
		throw new IllegalArgumentException(
		"Invalid subscribe config: ACTIVE subscribes can't have an Rx filter");
		}
		if (mSubscribeType == SubscribeConfig.SUBSCRIBE_TYPE_PASSIVE && mTxFilter != null
		&& mTxFilter.length != 0) {
		throw new IllegalArgumentException(
		"Invalid subscribe config: PASSIVE subscribes can't have a Tx filter");
		}
		}

		/**
		@@ -259,8 +236,7 @@ public class SubscribeConfig implements Parcelable {
		public static final class Builder {
		private byte[] mServiceName;
		private byte[] mServiceSpecificInfo;
		private byte[] mTxFilter;
		private byte[] mRxFilter;
		private byte[] mMatchFilter;
		private int mSubscribeType = SUBSCRIBE_TYPE_PASSIVE;
		private int mSubscribeCount = 0;
		private int mTtlSec = 0;
		@@ -331,51 +307,21 @@ public class SubscribeConfig implements Parcelable {
		}

		/**
		* The transmit filter for an active subscribe session
		* {@link SubscribeConfig.Builder#setSubscribeType(int)} and
		* {@link SubscribeConfig#SUBSCRIBE_TYPE_ACTIVE}. Included in
		* transmitted subscribe packets and used by receivers (passive
		* publishers) to determine whether they match - in addition to just
		* relying on the service name.
		* <p>
		* Format is an LV byte array: a single byte Length field followed by L bytes (the value of
		* the Length field) of a value blob.
		* </p>
		* <p>
		* Optional. Empty by default.
		* </p>
		*
		* @param txFilter The byte-array containing the LV formatted transmit
		* filter.
		*
		* @return The builder to facilitate chaining
		* {@code builder.setXXX(..).setXXX(..)}.
		*/
		public Builder setTxFilter(@Nullable byte[] txFilter) {
		mTxFilter = txFilter;
		return this;
		}

		/**
		* The transmit filter for a passive subsribe session
		* {@link SubscribeConfig.Builder#setSubscribeType(int)} and
		* {@link SubscribeConfig#SUBSCRIBE_TYPE_PASSIVE}. Used by the
		* subscriber to determine whether they match transmitted publish
		* packets - in addition to just relying on the service name.
		* The match filter for a subscribe session. Used to determine whether a service
		* discovery occurred - in addition to relying on the service name.
		* <p>
		* Format is an LV byte array: a single byte Length field followed by L bytes (the value of
		* the Length field) of a value blob.
		* <p>
		* Optional. Empty by default.
		*
		* @param rxFilter The byte-array containing the LV formatted receive
		* filter.
		* @param matchFilter The byte-array containing the LV formatted match filter.
		*
		* @return The builder to facilitate chaining
		* {@code builder.setXXX(..).setXXX(..)}.
		*/
		public Builder setRxFilter(@Nullable byte[] rxFilter) {
		mRxFilter = rxFilter;
		public Builder setMatchFilter(@Nullable byte[] matchFilter) {
		mMatchFilter = matchFilter;
		return this;
		}

		@@ -490,7 +436,7 @@ public class SubscribeConfig implements Parcelable {
		* builder.
		*/
		public SubscribeConfig build() {
		return new SubscribeConfig(mServiceName, mServiceSpecificInfo, mTxFilter, mRxFilter,
		return new SubscribeConfig(mServiceName, mServiceSpecificInfo, mMatchFilter,
		mSubscribeType, mSubscribeCount, mTtlSec, mMatchStyle,
		mEnableTerminateNotification);
		}