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

Merge "[NAN] Remove builder API using String to translate to byte[]" am: 1bca5ad210

Browse Source 
am: 62bceaabe9

Change-Id: I95f3e2581de041cef91f1e3f802b574a020df5c3
This commit is contained in:
Etan Cohen
2016-09-28 20:38:54 +00:00
committed by android-build-merger
parent 03e8ade55b 62bceaabe9
commit fd033a47e9
2 changed files with 0 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
wifi/java/android/net/wifi/nan/PublishConfig.java
View File

@@ -256,25 +256,6 @@ public final class PublishConfig implements Parcelable {
return this; 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 * The match filter for a publish session. Used to determine whether a service
* discovery occurred - in addition to relying on the service name. * discovery occurred - in addition to relying on the service name.

19
wifi/java/android/net/wifi/nan/SubscribeConfig.java
View File

@@ -288,25 +288,6 @@ public final class SubscribeConfig implements Parcelable {
return this; 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 * The match filter for a subscribe session. Used to determine whether a service
* discovery occurred - in addition to relying on the service name. * discovery occurred - in addition to relying on the service name.