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

Commit 8107226e authored by Paul Hu's avatar Paul Hu Committed by Automerger Merge Worker
Browse files

Merge "Fix FrameworksNetIntegrationTests failure" am: 5d496eb9 am: d8d1d3e2 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib4172f2b4eaec4f154bc8092531638cea3526d5f
parents 3739eed0 d8d1d3e2

tests/net/integration/src/com/android/server/net/integrationtests/ConnectivityServiceIntegrationTest.kt

+8 −1
Original line number Original line Diff line number Diff line
@@ -38,6 +38,7 @@ import android.net.metrics.IpConnectivityLog 
import android.os.ConditionVariable

import android.os.ConditionVariable

import android.os.IBinder

import android.os.IBinder

import android.os.INetworkManagementService

import android.os.INetworkManagementService

import android.os.UserHandle

import android.testing.TestableContext

import android.testing.TestableContext

import android.util.Log

import android.util.Log

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

import androidx.test.ext.junit.runners.AndroidJUnit4
@@ -55,10 +56,13 @@ import org.junit.Before 
import org.junit.BeforeClass

import org.junit.BeforeClass

import org.junit.Test

import org.junit.Test

import org.junit.runner.RunWith

import org.junit.runner.RunWith

import org.mockito.AdditionalAnswers

import org.mockito.Mock

import org.mockito.Mock

import org.mockito.Mockito.any

import org.mockito.Mockito.any

import org.mockito.Mockito.anyInt

import org.mockito.Mockito.doNothing

import org.mockito.Mockito.doNothing

import org.mockito.Mockito.doReturn

import org.mockito.Mockito.doReturn

import org.mockito.Mockito.eq

import org.mockito.Mockito.mock

import org.mockito.Mockito.mock

import org.mockito.Mockito.spy

import org.mockito.Mockito.spy

import org.mockito.MockitoAnnotations

import org.mockito.MockitoAnnotations
@@ -143,7 +147,10 @@ class ConnectivityServiceIntegrationTest { 
    @Before

    @Before

    fun setUp() {

    fun setUp() {

        MockitoAnnotations.initMocks(this)

        MockitoAnnotations.initMocks(this)

        doNothing().`when`(context).sendStickyBroadcastAsUser(any(), any(), any())

        val asUserCtx = mock(Context::class.java, AdditionalAnswers.delegatesTo<Context>(context))

        doReturn(UserHandle.ALL).`when`(asUserCtx).user

        doReturn(asUserCtx).`when`(context).createContextAsUser(eq(UserHandle.ALL), anyInt())

        doNothing().`when`(context).sendStickyBroadcast(any(), any())





        networkStackClient = TestNetworkStackClient(realContext)

        networkStackClient = TestNetworkStackClient(realContext)

        networkStackClient.init()

        networkStackClient.init()