diff options
| -rw-r--r-- | core/java/android/net/NetworkCapabilities.java | 2 | ||||
| -rw-r--r-- | tests/net/java/android/net/NetworkCapabilitiesTest.java | 11 |
2 files changed, 10 insertions, 3 deletions
diff --git a/core/java/android/net/NetworkCapabilities.java b/core/java/android/net/NetworkCapabilities.java index 0c44a566b48a..8a5f43de6883 100644 --- a/core/java/android/net/NetworkCapabilities.java +++ b/core/java/android/net/NetworkCapabilities.java @@ -931,7 +931,7 @@ public final class NetworkCapabilities implements Parcelable { * Returns a transport-specific information container. The application may cast this * container to a concrete sub-class based on its knowledge of the network request. The * application should be able to deal with a {@code null} return value or an invalid case, - * e.g. use {@code instanceof} operation to verify expected type. + * e.g. use {@code instanceof} operator to verify expected type. * * @return A concrete implementation of the {@link TransportInfo} class or null if not * available for the network. diff --git a/tests/net/java/android/net/NetworkCapabilitiesTest.java b/tests/net/java/android/net/NetworkCapabilitiesTest.java index 50aef1d24faf..84f735985b0d 100644 --- a/tests/net/java/android/net/NetworkCapabilitiesTest.java +++ b/tests/net/java/android/net/NetworkCapabilitiesTest.java @@ -474,7 +474,7 @@ public class NetworkCapabilitiesTest { new StringNetworkSpecifier("specs")); try { nc2.addTransportType(TRANSPORT_WIFI); - fail("Cannot set NetworkSpecifier on a NetworkCapability with multiple transports!"); + fail("Cannot set a second TransportType of a network which has a NetworkSpecifier!"); } catch (IllegalStateException expected) { // empty } @@ -500,16 +500,23 @@ public class NetworkCapabilitiesTest { // empty }); NetworkCapabilities nc2 = new NetworkCapabilities(); + // new TransportInfo so that object is not #equals to nc1's TransportInfo (that's where + // combine fails) nc2.setTransportInfo(new TransportInfo() { // empty }); try { nc1.combineCapabilities(nc2); - fail("Should not be able to combine NetworkCaabilities which contain TransportInfos"); + fail("Should not be able to combine NetworkCabilities which contain TransportInfos"); } catch (IllegalStateException expected) { // empty } + + // verify that can combine with identical TransportInfo objects + NetworkCapabilities nc3 = new NetworkCapabilities(); + nc3.setTransportInfo(nc1.getTransportInfo()); + nc1.combineCapabilities(nc3); } private void assertEqualsThroughMarshalling(NetworkCapabilities netCap) { |