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

Merge "Add type string to VCN NetworkAgentConfig"

Browse Source
This commit is contained in:
Benedict Wong
2022-02-16 21:00:36 +00:00
committed by Gerrit Code Review
parent 9ee2d46a8c 37a6ef1cd6
commit 0b957a2f89
2 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
services/core/java/com/android/server/vcn/VcnGatewayConnection.java
View File

@@ -78,6 +78,7 @@ import android.os.PowerManager.WakeLock;
import android.os.Process;
import android.os.SystemClock;
import android.provider.Settings;
import android.telephony.TelephonyManager;
import android.util.ArraySet;
import android.util.Slog;
@@ -163,6 +164,14 @@ import java.util.function.Consumer;
public class VcnGatewayConnection extends StateMachine {
private static final String TAG = VcnGatewayConnection.class.getSimpleName();
// Matches DataConnection.NETWORK_TYPE private constant, and magic string from
// ConnectivityManager#getNetworkTypeName()
@VisibleForTesting(visibility = Visibility.PRIVATE)
static final String NETWORK_INFO_NETWORK_TYPE_STRING = "MOBILE";
@VisibleForTesting(visibility = Visibility.PRIVATE)
static final String NETWORK_INFO_EXTRA_INFO = "VCN";
@VisibleForTesting(visibility = Visibility.PRIVATE)
static final InetAddress DUMMY_ADDR = InetAddresses.parseNumericAddress("192.0.2.0");
@@ -1631,6 +1640,12 @@ public class VcnGatewayConnection extends StateMachine {
final NetworkAgentConfig nac =
new NetworkAgentConfig.Builder()
.setLegacyType(ConnectivityManager.TYPE_MOBILE)
.setLegacyTypeName(NETWORK_INFO_NETWORK_TYPE_STRING)
.setLegacySubType(TelephonyManager.NETWORK_TYPE_UNKNOWN)
.setLegacySubTypeName(
TelephonyManager.getNetworkTypeName(
TelephonyManager.NETWORK_TYPE_UNKNOWN))
.setLegacyExtraInfo(NETWORK_INFO_EXTRA_INFO)
.build();
final VcnNetworkAgent agent =

5
tests/vcn/java/com/android/server/vcn/VcnGatewayConnectionConnectedStateTest.java
View File

@@ -307,7 +307,10 @@ public class VcnGatewayConnectionConnectedStateTest extends VcnGatewayConnection
ncCaptor.capture(),
lpCaptor.capture(),
any(),
argThat(nac -> nac.getLegacyType() == ConnectivityManager.TYPE_MOBILE),
// Subtype integer/name and extras do not have getters; cannot be tested.
argThat(nac -> nac.getLegacyType() == ConnectivityManager.TYPE_MOBILE
&& nac.getLegacyTypeName().equals(
VcnGatewayConnection.NETWORK_INFO_NETWORK_TYPE_STRING)),
any(),
any(),
any());