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

Commit 13b502ad authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

Merge "Merge "Add type string to VCN NetworkAgentConfig" am: 0b957a2f am:... 

Merge "Merge "Add type string to VCN NetworkAgentConfig" am: 0b957a2f am: a6e485df am: 027d32db"
parents 75d4e458 b18f820c

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

+15 −0
Original line number Original line Diff line number Diff line
@@ -78,6 +78,7 @@ import android.os.PowerManager.WakeLock; 
import android.os.Process;

import android.os.Process;

import android.os.SystemClock;

import android.os.SystemClock;

import android.provider.Settings;

import android.provider.Settings;

import android.telephony.TelephonyManager;

import android.util.ArraySet;

import android.util.ArraySet;

import android.util.Slog;

import android.util.Slog;
@@ -163,6 +164,14 @@ import java.util.function.Consumer; 
public class VcnGatewayConnection extends StateMachine {

public class VcnGatewayConnection extends StateMachine {

    private static final String TAG = VcnGatewayConnection.class.getSimpleName();

    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)

    @VisibleForTesting(visibility = Visibility.PRIVATE)

    static final InetAddress DUMMY_ADDR = InetAddresses.parseNumericAddress("192.0.2.0");

    static final InetAddress DUMMY_ADDR = InetAddresses.parseNumericAddress("192.0.2.0");
@@ -1631,6 +1640,12 @@ public class VcnGatewayConnection extends StateMachine { 
            final NetworkAgentConfig nac =

            final NetworkAgentConfig nac =

                    new NetworkAgentConfig.Builder()

                    new NetworkAgentConfig.Builder()

                            .setLegacyType(ConnectivityManager.TYPE_MOBILE)

                            .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();

                            .build();





            final VcnNetworkAgent agent =

            final VcnNetworkAgent agent =

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

+4 −1
Original line number Original line Diff line number Diff line
@@ -307,7 +307,10 @@ public class VcnGatewayConnectionConnectedStateTest extends VcnGatewayConnection 
                        ncCaptor.capture(),

                        ncCaptor.capture(),

                        lpCaptor.capture(),

                        lpCaptor.capture(),

                        any(),

                        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(),

                        any(),

                        any());

                        any());