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

Merge "Set TRANSPORT_PRIMARY for VCN NetworkOffers and NetworkAgents" am: d92daec786

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

Change-Id: I53e05e622e1d89dd70798855eee79ceb67c1edaf
This commit is contained in:
Benedict Wong
2021-07-21 01:48:06 +00:00
committed by Automerger Merge Worker
parent f92201554a d92daec786
commit 697971f693
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/core/java/com/android/server/vcn/Vcn.java
View File

@@ -596,7 +596,12 @@ public class Vcn extends Handler {
/** Retrieves the network score for a VCN Network */ /** Retrieves the network score for a VCN Network */
// Package visibility for use in VcnGatewayConnection and VcnNetworkProvider // Package visibility for use in VcnGatewayConnection and VcnNetworkProvider
static NetworkScore getNetworkScore() { static NetworkScore getNetworkScore() {
return new NetworkScore.Builder().setLegacyInt(VCN_LEGACY_SCORE_INT).build(); // TODO(b/193687515): Stop setting TRANSPORT_PRIMARY, define a TRANSPORT_VCN, and set in
// NetworkOffer/NetworkAgent.
return new NetworkScore.Builder()
.setLegacyInt(VCN_LEGACY_SCORE_INT)
.setTransportPrimary(true)
.build();
} }
/** Callback used for passing status signals from a VcnGatewayConnection to its managing Vcn. */ /** Callback used for passing status signals from a VcnGatewayConnection to its managing Vcn. */

4
tests/vcn/java/com/android/server/vcn/VcnNetworkProviderTest.java
View File

@@ -87,8 +87,8 @@ public class VcnNetworkProviderTest {
eq(mVcnNetworkProvider), eq(mVcnNetworkProvider),
argThat( argThat(
score -> score ->
score.getLegacyInt() score.getLegacyInt() == Vcn.getNetworkScore().getLegacyInt()
== Vcn.getNetworkScore().getLegacyInt()), && score.isTransportPrimary()),
any(), any(),
any(), any(),
cbCaptor.capture()); cbCaptor.capture());