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

Commit 91b2b0cc authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN Committed by android-build-merger
Browse files

Merge changes I9dbbf904,Iebc174ed 

am: 06d80679

Change-Id: I30176a7bd0992d3a038458c0ccbe3a7ba9ecc9f7
parents f99fce01 06d80679

packages/NetworkStack/TEST_MAPPING

+1 −1
Original line number Diff line number Diff line 
{

  "postsubmit": [

  "presubmit": [

    {

      "name": "NetworkStackTests"

    }

packages/NetworkStack/tests/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ android_test { 
    resource_dirs: ["res"],

    static_libs: [

        "androidx.test.rules",

        "frameworks-base-testutils",

        "mockito-target-extended-minus-junit4",

        "NetworkStackLib",

        "testables",

packages/NetworkStack/tests/src/android/net/ip/IpClientTest.java

+2 −7
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ import static org.mockito.Mockito.verify; 
import static org.mockito.Mockito.when;



import android.app.AlarmManager;

import android.content.ContentResolver;

import android.content.Context;

import android.content.res.Resources;

import android.net.ConnectivityManager;
@@ -46,14 +47,11 @@ import android.net.RouteInfo; 
import android.net.shared.InitialConfiguration;

import android.net.shared.ProvisioningConfiguration;

import android.net.util.InterfaceParams;

import android.provider.Settings;

import android.test.mock.MockContentResolver;



import androidx.test.filters.SmallTest;

import androidx.test.runner.AndroidJUnit4;



import com.android.internal.R;

import com.android.internal.util.test.FakeSettingsProvider;

import com.android.server.NetworkObserver;

import com.android.server.NetworkObserverRegistry;
@@ -94,7 +92,7 @@ public class IpClientTest { 
    @Mock private IIpClientCallbacks mCb;

    @Mock private AlarmManager mAlarm;

    @Mock private IpClient.Dependencies mDependencies;

    private MockContentResolver mContentResolver;

    @Mock private ContentResolver mContentResolver;



    private NetworkObserver mObserver;

    private InterfaceParams mIfParams;
@@ -109,9 +107,6 @@ public class IpClientTest { 
        when(mDependencies.getNetd(any())).thenReturn(mNetd);

        when(mResources.getInteger(R.integer.config_networkAvoidBadWifi))

                .thenReturn(DEFAULT_AVOIDBADWIFI_CONFIG_VALUE);



        mContentResolver = new MockContentResolver();

        mContentResolver.addProvider(Settings.AUTHORITY, new FakeSettingsProvider());

        when(mContext.getContentResolver()).thenReturn(mContentResolver);



        mIfParams = null;