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

Merge "[CM] Fix comments, add tests to TransportInfo API" am: 4060bc1480 am: 4e20619d98

Browse Source 
am: b03827647f

Change-Id: I0a81b7b48bb02da202dd7feaa1440801b794ce67
This commit is contained in:
Etan Cohen
2018-12-11 22:22:36 -08:00
committed by android-build-merger
parent febb46ef31 b03827647f
commit 1457e13e50
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -931,7 +931,7 @@ public final class NetworkCapabilities implements Parcelable {
* Returns a transport-specific information container. The application may cast this * 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 * 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, * 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 * @return A concrete implementation of the {@link TransportInfo} class or null if not
* available for the network. * available for the network.

11
tests/net/java/android/net/NetworkCapabilitiesTest.java
View File

@@ -474,7 +474,7 @@ public class NetworkCapabilitiesTest {
new StringNetworkSpecifier("specs")); new StringNetworkSpecifier("specs"));
try { try {
nc2.addTransportType(TRANSPORT_WIFI); 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) { } catch (IllegalStateException expected) {
// empty // empty
} }
@@ -500,16 +500,23 @@ public class NetworkCapabilitiesTest {
// empty // empty
}); });
NetworkCapabilities nc2 = new NetworkCapabilities(); 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() { nc2.setTransportInfo(new TransportInfo() {
// empty // empty
}); });
try { try {
nc1.combineCapabilities(nc2); 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) { } catch (IllegalStateException expected) {
// empty // 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) { private void assertEqualsThroughMarshalling(NetworkCapabilities netCap) {