Remove unwanted capability code per API council feedback.

The addition of hasUnwantedCapability was late in the release
cycle and does not simplify the API enough to be worth it. The
recommendation is, in a future release, to do something more
complete: not just add something like addUnwantedCapability, but
also deprecate all the NET_CAPABILITY_NOT_xxx constants and add
opposite NET_CAPABILITY_xxx constants for use with it.

Fix: 77601789
Test: builds, boots
Test: atest android.net.cts.NetworkRequestTest
Test: atest android.net.cts.ConnectivityManagerTest
Change-Id: Ib98fb01da4a4a0bae464787b589ad88f45002eb8
This commit is contained in:
Lorenzo Colitti
2018-04-06 17:35:33 +09:00
parent 9b43bdba19
commit f4bdf74cd6

View File

@@ -233,6 +233,8 @@ public class NetworkRequest implements Parcelable {
* *
* @param capability The capability to add to unwanted capability list. * @param capability The capability to add to unwanted capability list.
* @return The builder to facilitate chaining. * @return The builder to facilitate chaining.
*
* @removed
*/ */
public Builder addUnwantedCapability(@NetworkCapabilities.NetCapability int capability) { public Builder addUnwantedCapability(@NetworkCapabilities.NetCapability int capability) {
mNetworkCapabilities.addUnwantedCapability(capability); mNetworkCapabilities.addUnwantedCapability(capability);
@@ -439,6 +441,8 @@ public class NetworkRequest implements Parcelable {
/** /**
* @see Builder#addUnwantedCapability(int) * @see Builder#addUnwantedCapability(int)
*
* @removed
*/ */
public boolean hasUnwantedCapability(@NetCapability int capability) { public boolean hasUnwantedCapability(@NetCapability int capability) {
return networkCapabilities.hasUnwantedCapability(capability); return networkCapabilities.hasUnwantedCapability(capability);