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

Commit ea2bc080 authored by Chiachang Wang's avatar Chiachang Wang Committed by Automerger Merge Worker
Browse files

Merge changes I40241276,Ibbd47582 into main am: a2e6ce7b am: a15e9ac2 

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



Change-Id: I1b2cc9afef6d0ea97a8b4ff208acb351cf2de2ba
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents fb91f165 a15e9ac2

services/tests/VpnTests/java/android/net/Ikev2VpnProfileTest.java

+2 −24
Original line number Diff line number Diff line
@@ -20,8 +20,6 @@ import static android.net.cts.util.IkeSessionTestUtils.CHILD_PARAMS; 
import static android.net.cts.util.IkeSessionTestUtils.IKE_PARAMS_V6;

import static android.net.cts.util.IkeSessionTestUtils.getTestIkeSessionParams;



import static com.android.testutils.DevSdkIgnoreRuleKt.SC_V2;



import static org.junit.Assert.assertArrayEquals;

import static org.junit.Assert.assertEquals;

import static org.junit.Assert.assertNotNull;
@@ -31,19 +29,15 @@ import static org.junit.Assert.fail; 


import android.net.ipsec.ike.IkeKeyIdIdentification;

import android.net.ipsec.ike.IkeTunnelConnectionParams;

import android.os.Build;

import android.test.mock.MockContext;



import androidx.test.ext.junit.runners.AndroidJUnit4;

import androidx.test.filters.SmallTest;



import com.android.internal.net.VpnProfile;

import com.android.internal.org.bouncycastle.x509.X509V1CertificateGenerator;

import com.android.net.module.util.ProxyUtils;

import com.android.testutils.DevSdkIgnoreRule;

import com.android.testutils.DevSdkIgnoreRunner;



import org.junit.Before;

import org.junit.Rule;

import org.junit.Test;

import org.junit.runner.RunWith;
@@ -62,8 +56,7 @@ import javax.security.auth.x500.X500Principal; 


/** Unit tests for {@link Ikev2VpnProfile.Builder}. */

@SmallTest

@RunWith(DevSdkIgnoreRunner.class)

@DevSdkIgnoreRule.IgnoreUpTo(Build.VERSION_CODES.R)

@RunWith(AndroidJUnit4.class)

public class Ikev2VpnProfileTest {

    private static final String SERVER_ADDR_STRING = "1.2.3.4";

    private static final String IDENTITY_STRING = "Identity";
@@ -73,16 +66,6 @@ public class Ikev2VpnProfileTest { 
    private static final byte[] PSK_BYTES = "preSharedKey".getBytes();

    private static final int TEST_MTU = 1300;



    @Rule

    public final DevSdkIgnoreRule ignoreRule = new DevSdkIgnoreRule();



    private final MockContext mMockContext =

            new MockContext() {

                @Override

                public String getOpPackageName() {

                    return "fooPackage";

                }

            };

    private final ProxyInfo mProxy = ProxyInfo.buildDirectProxy(

            SERVER_ADDR_STRING, -1, ProxyUtils.exclusionStringAsList(EXCL_LIST));
@@ -227,7 +210,6 @@ public class Ikev2VpnProfileTest { 
    @Test

    public void testSetAllowedAlgorithmsInvalidList() throws Exception {

        final Ikev2VpnProfile.Builder builder = getBuilderWithDefaultOptions();

        List<String> allowedAlgorithms = new ArrayList<>();



        try {

            builder.setAllowedAlgorithms(Arrays.asList(IpSecAlgorithm.AUTH_HMAC_SHA256));
@@ -245,7 +227,6 @@ public class Ikev2VpnProfileTest { 
    @Test

    public void testSetAllowedAlgorithmsInsecureAlgorithm() throws Exception {

        final Ikev2VpnProfile.Builder builder = getBuilderWithDefaultOptions();

        List<String> allowedAlgorithms = new ArrayList<>();



        try {

            builder.setAllowedAlgorithms(Arrays.asList(IpSecAlgorithm.AUTH_HMAC_MD5));
@@ -271,9 +252,6 @@ public class Ikev2VpnProfileTest { 
        }

    }





    // TODO: Refer to Build.VERSION_CODES.SC_V2 when it's available in AOSP and mainline branch

    @DevSdkIgnoreRule.IgnoreUpTo(SC_V2)

    @Test

    public void testBuildExcludeLocalRoutesSet() throws Exception {

        final Ikev2VpnProfile.Builder builder = getBuilderWithDefaultOptions();

services/tests/VpnTests/java/android/net/VpnManagerTest.java

+2 −6
Original line number Diff line number Diff line
@@ -29,17 +29,15 @@ import static org.mockito.Mockito.when; 
import android.content.ComponentName;

import android.content.Intent;

import android.content.pm.PackageManager;

import android.os.Build;

import android.test.mock.MockContext;

import android.util.SparseArray;



import androidx.test.InstrumentationRegistry;

import androidx.test.ext.junit.runners.AndroidJUnit4;

import androidx.test.filters.SmallTest;



import com.android.internal.net.VpnProfile;

import com.android.internal.util.MessageUtils;

import com.android.testutils.DevSdkIgnoreRule;

import com.android.testutils.DevSdkIgnoreRunner;



import org.junit.Before;

import org.junit.Test;
@@ -47,13 +45,11 @@ import org.junit.runner.RunWith; 


/** Unit tests for {@link VpnManager}. */

@SmallTest

@RunWith(DevSdkIgnoreRunner.class)

@DevSdkIgnoreRule.IgnoreUpTo(Build.VERSION_CODES.R)

@RunWith(AndroidJUnit4.class)

public class VpnManagerTest {



    private static final String PKG_NAME = "fooPackage";



    private static final String SESSION_NAME_STRING = "testSession";

    private static final String SERVER_ADDR_STRING = "1.2.3.4";

    private static final String IDENTITY_STRING = "Identity";

    private static final byte[] PSK_BYTES = "preSharedKey".getBytes();

services/tests/VpnTests/java/com/android/internal/net/VpnProfileTest.java

+4 −19
Original line number Diff line number Diff line
@@ -19,8 +19,6 @@ package com.android.internal.net; 
import static android.net.cts.util.IkeSessionTestUtils.CHILD_PARAMS;

import static android.net.cts.util.IkeSessionTestUtils.IKE_PARAMS_V4;



import static com.android.modules.utils.build.SdkLevel.isAtLeastT;

import static com.android.modules.utils.build.SdkLevel.isAtLeastU;

import static com.android.testutils.ParcelUtils.assertParcelSane;



import static org.junit.Assert.assertEquals;
@@ -32,13 +30,10 @@ import static org.junit.Assert.assertTrue; 


import android.net.IpSecAlgorithm;

import android.net.ipsec.ike.IkeTunnelConnectionParams;

import android.os.Build;



import androidx.test.ext.junit.runners.AndroidJUnit4;

import androidx.test.filters.SmallTest;



import com.android.testutils.DevSdkIgnoreRule;

import com.android.testutils.DevSdkIgnoreRunner;



import org.junit.Test;

import org.junit.runner.RunWith;
@@ -48,8 +43,7 @@ import java.util.List; 


/** Unit tests for {@link VpnProfile}. */

@SmallTest

@RunWith(DevSdkIgnoreRunner.class)

@DevSdkIgnoreRule.IgnoreUpTo(Build.VERSION_CODES.R)

@RunWith(AndroidJUnit4.class)

public class VpnProfileTest {

    private static final String DUMMY_PROFILE_KEY = "Test";
@@ -176,17 +170,8 @@ public class VpnProfileTest { 


    @Test

    public void testParcelUnparcel() {

        if (isAtLeastU()) {

            // automaticNattKeepaliveTimerEnabled, automaticIpVersionSelectionEnabled added in U.

        assertParcelSane(getSampleIkev2Profile(DUMMY_PROFILE_KEY), 28);

        assertParcelSane(getSampleIkev2ProfileWithIkeTunConnParams(DUMMY_PROFILE_KEY), 28);

        } else if (isAtLeastT()) {

            // excludeLocalRoutes, requiresPlatformValidation were added in T.

            assertParcelSane(getSampleIkev2Profile(DUMMY_PROFILE_KEY), 26);

            assertParcelSane(getSampleIkev2ProfileWithIkeTunConnParams(DUMMY_PROFILE_KEY), 26);

        } else {

            assertParcelSane(getSampleIkev2Profile(DUMMY_PROFILE_KEY), 23);

        }

    }



    @Test