Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes I4b135749,If4fcaa52

Browse Source 
* changes:
  Restructure Test Network requests for VCN connections.
  Correct variable name in VcnManagementService.
This commit is contained in:
Cody Kesting
2021-05-12 22:55:17 +00:00
committed by Gerrit Code Review
parent 5c1879cb60 da188b3719
commit 576dad4673
3 changed files with 20 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/VcnManagementService.java
View File

@@ -335,8 +335,8 @@ public class VcnManagementService extends IVcnManagementService.Stub {
@NonNull Context context,
@NonNull Looper looper,
@NonNull VcnNetworkProvider vcnNetworkProvider,
boolean getIsInTestMode) {
return new VcnContext(context, looper, vcnNetworkProvider, getIsInTestMode);
boolean isInTestMode) {
return new VcnContext(context, looper, vcnNetworkProvider, isInTestMode);
}
/** Creates a new Vcn instance using the provided configuration */

5
services/core/java/com/android/server/vcn/UnderlyingNetworkTracker.java
View File

@@ -219,10 +219,9 @@ public class UnderlyingNetworkTracker {
/** Builds and returns a NetworkRequest for the given subIds to match Test Networks. */
private NetworkRequest getTestNetworkRequest(@NonNull Set<Integer> subIds) {
return getBaseNetworkRequestBuilder()
return new NetworkRequest.Builder()
.clearCapabilities()
.addTransportType(NetworkCapabilities.TRANSPORT_TEST)
.removeCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)
.removeCapability(NetworkCapabilities.NET_CAPABILITY_NOT_VPN)
.setSubscriptionIds(subIds)
.build();
}

35
tests/vcn/java/com/android/server/vcn/UnderlyingNetworkTrackerTest.java
View File

@@ -163,27 +163,30 @@ public class UnderlyingNetworkTrackerTest {
@Test
public void testNetworkCallbacksRegisteredOnStartupForTestMode() {
resetVcnContext();
when(mVcnContext.isInTestMode()).thenReturn(true);
reset(mConnectivityManager);
final VcnContext vcnContext =
spy(
new VcnContext(
mContext,
mTestLooper.getLooper(),
mVcnNetworkProvider,
true /* isInTestMode */));
mUnderlyingNetworkTracker =
new UnderlyingNetworkTracker(
mVcnContext,
vcnContext,
SUB_GROUP,
mSubscriptionSnapshot,
Collections.singleton(NetworkCapabilities.NET_CAPABILITY_INTERNET),
mNetworkTrackerCb);
verifyNetworkRequestsRegistered(INITIAL_SUB_IDS, true /* expectTestMode */);
verify(mConnectivityManager)
.requestBackgroundNetwork(
eq(getTestNetworkRequest(INITIAL_SUB_IDS)),
any(RouteSelectionCallback.class),
any());
}
private void verifyNetworkRequestsRegistered(Set<Integer> expectedSubIds) {
verifyNetworkRequestsRegistered(expectedSubIds, false /* expectTestMode */);
}
private void verifyNetworkRequestsRegistered(
Set<Integer> expectedSubIds, boolean expectTestMode) {
verify(mConnectivityManager)
.requestBackgroundNetwork(
eq(getWifiRequest(expectedSubIds)),
@@ -196,14 +199,9 @@ public class UnderlyingNetworkTrackerTest {
any(NetworkBringupCallback.class), any());
}
final NetworkRequest expectedRouteSelectionRequest =
expectTestMode
? getTestNetworkRequest(expectedSubIds)
: getRouteSelectionRequest(expectedSubIds);
verify(mConnectivityManager)
.requestBackgroundNetwork(
eq(expectedRouteSelectionRequest),
eq(getRouteSelectionRequest(expectedSubIds)),
any(RouteSelectionCallback.class),
any());
}
@@ -245,10 +243,9 @@ public class UnderlyingNetworkTrackerTest {
}
private NetworkRequest getTestNetworkRequest(Set<Integer> netCapsSubIds) {
return getExpectedRequestBase()
return new NetworkRequest.Builder()
.clearCapabilities()
.addTransportType(NetworkCapabilities.TRANSPORT_TEST)
.removeCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)
.removeCapability(NetworkCapabilities.NET_CAPABILITY_NOT_VPN)
.setSubscriptionIds(netCapsSubIds)
.build();
}