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

Merge changes I4b135749,If4fcaa52 am: 576dad4673 am: cd4e6ae6d6

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1704175

Change-Id: I31a2eda921b88ebe0c70492e39f4b448f6c91b93
This commit is contained in:
Cody Kesting
2021-05-12 23:15:28 +00:00
committed by Automerger Merge Worker
parent c985b4066c cd4e6ae6d6
commit 5cdc27d2ac
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 Context context,
@NonNull Looper looper, @NonNull Looper looper,
@NonNull VcnNetworkProvider vcnNetworkProvider, @NonNull VcnNetworkProvider vcnNetworkProvider,
boolean getIsInTestMode) { boolean isInTestMode) {
return new VcnContext(context, looper, vcnNetworkProvider, getIsInTestMode); return new VcnContext(context, looper, vcnNetworkProvider, isInTestMode);
} }
/** Creates a new Vcn instance using the provided configuration */ /** 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. */ /** Builds and returns a NetworkRequest for the given subIds to match Test Networks. */
private NetworkRequest getTestNetworkRequest(@NonNull Set<Integer> subIds) { private NetworkRequest getTestNetworkRequest(@NonNull Set<Integer> subIds) {
return getBaseNetworkRequestBuilder() return new NetworkRequest.Builder()
.clearCapabilities()
.addTransportType(NetworkCapabilities.TRANSPORT_TEST) .addTransportType(NetworkCapabilities.TRANSPORT_TEST)
.removeCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)
.removeCapability(NetworkCapabilities.NET_CAPABILITY_NOT_VPN)
.setSubscriptionIds(subIds) .setSubscriptionIds(subIds)
.build(); .build();
} }

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

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