diff options
| author | Benedict Wong <benedictwong@google.com> | 2021-07-21 02:05:47 +0000 |
|---|---|---|
| committer | Benedict Wong <benedictwong@google.com> | 2021-07-21 02:11:01 +0000 |
| commit | 8d35744f98c14ff30fb04e7fd9225a20552b1671 (patch) | |
| tree | 623329103e96aca1ecdae3f3a1c54c3163ffc954 /tests | |
| parent | 019189c35a9f629823f57b254a37c01da4290643 (diff) | |
Set TRANSPORT_PRIMARY for VCN NetworkOffers and NetworkAgents
This change sets TRANSPORT_PRIMARY for all NetworkScore objects passed
to ConnectivityService by the VCN. Without this patch, a VCN in safe
mode will never get any NetworkRequests, since the new Policy-based
NetworkRanker always prioritizes a existing satisfier of a network,
regardless of score. However, a higher-priority policy check ensures
that a TRANSPORT_PRIMARY request is used if it exists. This changes the
VCN to utilize that functionality.
Bug: 194122634
Test: atest FrameworksVcnTests
Original-Change: https://android-review.googlesource.com/1772025
Merged-In: I3a298a6c4c594c6e224f3f05764614802c00e9b0
Change-Id: I3a298a6c4c594c6e224f3f05764614802c00e9b0
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/vcn/java/com/android/server/vcn/VcnNetworkProviderTest.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/vcn/java/com/android/server/vcn/VcnNetworkProviderTest.java b/tests/vcn/java/com/android/server/vcn/VcnNetworkProviderTest.java index 72db55b3f4c5..e9026e22b6b2 100644 --- a/tests/vcn/java/com/android/server/vcn/VcnNetworkProviderTest.java +++ b/tests/vcn/java/com/android/server/vcn/VcnNetworkProviderTest.java @@ -87,8 +87,8 @@ public class VcnNetworkProviderTest { eq(mVcnNetworkProvider), argThat( score -> - score.getLegacyInt() - == Vcn.getNetworkScore().getLegacyInt()), + score.getLegacyInt() == Vcn.getNetworkScore().getLegacyInt() + && score.isTransportPrimary()), any(), any(), cbCaptor.capture()); |