Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8e4f34e4 authored by Benedict Wong's avatar Benedict Wong Committed by Android (Google) Code Review
Browse files

Merge "Add type string to VCN NetworkAgentConfig" into sc-v2-dev

parents acbbf43c 6366a704

services/core/java/com/android/server/vcn/VcnGatewayConnection.java

+15 −0
Original line number Diff line number Diff line
@@ -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;
@@ -162,6 +163,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");
@@ -1625,6 +1634,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 =

tests/vcn/java/com/android/server/vcn/VcnGatewayConnectionConnectedStateTest.java

+4 −1
Original line number Diff line number Diff line
@@ -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());