Merge "Merge "[NAN] Remove builder API using String to translate to byte[]"... (e1fbfac6) · Commits · e / os / android_frameworks_base

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

+0 −19

Original line number	Diff line number	Diff line
		@@ -256,25 +256,6 @@ public final class PublishConfig implements Parcelable {
		return this;
		}

		/**
		* Specify service specific information for the publish session - a simple wrapper
		* of {@link PublishConfig.Builder#setServiceSpecificInfo(byte[])}
		* obtaining the data from a String.
		* <p>
		* Optional. Empty by default.
		*
		* @param serviceSpecificInfoStr The service specific information string
		* to be included (as a byte array) in the publish
		* information.
		*
		* @return The builder to facilitate chaining
		* {@code builder.setXXX(..).setXXX(..)}.
		*/
		public Builder setServiceSpecificInfo(@NonNull String serviceSpecificInfoStr) {
		mServiceSpecificInfo = serviceSpecificInfoStr.getBytes();
		return this;
		}

		/**
		* The match filter for a publish session. Used to determine whether a service
		* discovery occurred - in addition to relying on the service name.

+0 −19

Original line number	Diff line number	Diff line
		@@ -288,25 +288,6 @@ public final class SubscribeConfig implements Parcelable {
		return this;
		}

		/**
		* Specify service specific information for the subscribe session - a simple wrapper
		* of {@link SubscribeConfig.Builder#setServiceSpecificInfo(byte[])}
		* obtaining the data from a String.
		* <p>
		* Optional. Empty by default.
		*
		* @param serviceSpecificInfoStr The service specific information string
		* to be included (as a byte array) in the subscribe
		* information.
		*
		* @return The builder to facilitate chaining
		* {@code builder.setXXX(..).setXXX(..)}.
		*/
		public Builder setServiceSpecificInfo(@NonNull String serviceSpecificInfoStr) {
		mServiceSpecificInfo = serviceSpecificInfoStr.getBytes();
		return this;
		}

		/**
		* The match filter for a subscribe session. Used to determine whether a service
		* discovery occurred - in addition to relying on the service name.