Set WifiAwareNetworkInfo into setTransportInfo()

Bug: 139268426
Bug: 135998869
Bug: 138306002
Test: atest CtsNetTestCasesLatestSdk:NetworkCapabilitiesTest
Change-Id: Ibbe1cd126d6538003fbb1e5e85892bfb15a920e8
Merged-In: Ibbe1cd126d6538003fbb1e5e85892bfb15a920e8
This commit is contained in:
lucaslin
2020-04-08 14:54:06 +08:00
committed by Lucas Lin
parent b0104c84f8
commit 311bd48fe8

View File

@@ -875,6 +875,11 @@ public class NetworkCapabilitiesTest {
} catch (IllegalArgumentException e) { } } catch (IllegalArgumentException e) { }
} }
private class TestTransportInfo implements TransportInfo {
TestTransportInfo() {
}
}
@Test @IgnoreUpTo(Build.VERSION_CODES.Q) @Test @IgnoreUpTo(Build.VERSION_CODES.Q)
public void testBuilder() { public void testBuilder() {
final int ownerUid = 1001; final int ownerUid = 1001;
@@ -882,6 +887,7 @@ public class NetworkCapabilitiesTest {
final int requestUid = 10100; final int requestUid = 10100;
final int[] administratorUids = {ownerUid, 10001}; final int[] administratorUids = {ownerUid, 10001};
final TelephonyNetworkSpecifier specifier = new TelephonyNetworkSpecifier(1); final TelephonyNetworkSpecifier specifier = new TelephonyNetworkSpecifier(1);
final TestTransportInfo transportInfo = new TestTransportInfo();
final String ssid = "TEST_SSID"; final String ssid = "TEST_SSID";
final String packageName = "com.google.test.networkcapabilities"; final String packageName = "com.google.test.networkcapabilities";
final NetworkCapabilities nc = new NetworkCapabilities.Builder() final NetworkCapabilities nc = new NetworkCapabilities.Builder()
@@ -896,7 +902,7 @@ public class NetworkCapabilitiesTest {
.setLinkDownstreamBandwidthKbps(512) .setLinkDownstreamBandwidthKbps(512)
.setLinkUpstreamBandwidthKbps(128) .setLinkUpstreamBandwidthKbps(128)
.setNetworkSpecifier(specifier) .setNetworkSpecifier(specifier)
.setTransportInfo(null) .setTransportInfo(transportInfo)
.setSignalStrength(signalStrength) .setSignalStrength(signalStrength)
.setSsid(ssid) .setSsid(ssid)
.setRequestorUid(requestUid) .setRequestorUid(requestUid)
@@ -913,7 +919,7 @@ public class NetworkCapabilitiesTest {
assertEquals(128, nc.getLinkUpstreamBandwidthKbps()); assertEquals(128, nc.getLinkUpstreamBandwidthKbps());
assertNotEquals(512, nc.getLinkUpstreamBandwidthKbps()); assertNotEquals(512, nc.getLinkUpstreamBandwidthKbps());
assertEquals(specifier, nc.getNetworkSpecifier()); assertEquals(specifier, nc.getNetworkSpecifier());
assertNull(nc.getTransportInfo()); assertEquals(transportInfo, nc.getTransportInfo());
assertEquals(signalStrength, nc.getSignalStrength()); assertEquals(signalStrength, nc.getSignalStrength());
assertNotEquals(-50, nc.getSignalStrength()); assertNotEquals(-50, nc.getSignalStrength());
assertEquals(ssid, nc.getSsid()); assertEquals(ssid, nc.getSsid());