LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve NetworkCapabilities command chaining.

Browse Source 
setNetworkSpecifier() now returns this.
BUG: 26797290

Change-Id: Ia8bd0836d9ac715408eca102bf4a2d23f044fa72
This commit is contained in:
Pierre Imai
2016-03-22 17:54:54 +09:00
parent 6114f2bbb1
commit aabd22dad9
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/java/android/net/NetworkCapabilities.java
View File

@@ -248,7 +248,7 @@ public final class NetworkCapabilities implements Parcelable {
* for a network to satisfy a request, all capabilities requested must be satisfied. * for a network to satisfy a request, all capabilities requested must be satisfied.
* *
* @param capability the {@code NetworkCapabilities.NET_CAPABILITY_*} to be added. * @param capability the {@code NetworkCapabilities.NET_CAPABILITY_*} to be added.
* @return This NetworkCapability to facilitate chaining. * @return This NetworkCapabilities instance, to facilitate chaining.
* @hide * @hide
*/ */
public NetworkCapabilities addCapability(int capability) { public NetworkCapabilities addCapability(int capability) {
@@ -263,7 +263,7 @@ public final class NetworkCapabilities implements Parcelable {
* Removes (if found) the given capability from this {@code NetworkCapability} instance. * Removes (if found) the given capability from this {@code NetworkCapability} instance.
* *
* @param capability the {@code NetworkCapabilities.NET_CAPABILTIY_*} to be removed. * @param capability the {@code NetworkCapabilities.NET_CAPABILTIY_*} to be removed.
* @return This NetworkCapability to facilitate chaining. * @return This NetworkCapabilities instance, to facilitate chaining.
* @hide * @hide
*/ */
public NetworkCapabilities removeCapability(int capability) { public NetworkCapabilities removeCapability(int capability) {
@@ -418,7 +418,7 @@ public final class NetworkCapabilities implements Parcelable {
* {@code NetworkCapabilities.NET_CAPABILITY_*} listed above. * {@code NetworkCapabilities.NET_CAPABILITY_*} listed above.
* *
* @param transportType the {@code NetworkCapabilities.TRANSPORT_*} to be added. * @param transportType the {@code NetworkCapabilities.TRANSPORT_*} to be added.
* @return This NetworkCapability to facilitate chaining. * @return This NetworkCapabilities instance, to facilitate chaining.
* @hide * @hide
*/ */
public NetworkCapabilities addTransportType(int transportType) { public NetworkCapabilities addTransportType(int transportType) {
@@ -434,7 +434,7 @@ public final class NetworkCapabilities implements Parcelable {
* Removes (if found) the given transport from this {@code NetworkCapability} instance. * Removes (if found) the given transport from this {@code NetworkCapability} instance.
* *
* @param transportType the {@code NetworkCapabilities.TRANSPORT_*} to be removed. * @param transportType the {@code NetworkCapabilities.TRANSPORT_*} to be removed.
* @return This NetworkCapability to facilitate chaining. * @return This NetworkCapabilities instance, to facilitate chaining.
* @hide * @hide
*/ */
public NetworkCapabilities removeTransportType(int transportType) { public NetworkCapabilities removeTransportType(int transportType) {
@@ -578,14 +578,16 @@ public final class NetworkCapabilities implements Parcelable {
* @param networkSpecifier An {@code String} of opaque format used to specify the bearer * @param networkSpecifier An {@code String} of opaque format used to specify the bearer
* specific network specifier where the bearer has a choice of * specific network specifier where the bearer has a choice of
* networks. * networks.
* @return This NetworkCapabilities instance, to facilitate chaining.
* @hide * @hide
*/ */
public void setNetworkSpecifier(String networkSpecifier) { public NetworkCapabilities setNetworkSpecifier(String networkSpecifier) {
if (TextUtils.isEmpty(networkSpecifier) == false && Long.bitCount(mTransportTypes) != 1) { if (TextUtils.isEmpty(networkSpecifier) == false && Long.bitCount(mTransportTypes) != 1) {
throw new IllegalStateException("Must have a single transport specified to use " + throw new IllegalStateException("Must have a single transport specified to use " +
"setNetworkSpecifier"); "setNetworkSpecifier");
} }
mNetworkSpecifier = networkSpecifier; mNetworkSpecifier = networkSpecifier;
return this;
} }
/** /**