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

Commit 9bc475ec authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 7132927 from 2c3466f2 to mainline-wifi-release 

Change-Id: I425542d0cb7e0a63dc9b60299223f3f34bc1a0a7
parents c4059ccd 2c3466f2

Android.bp

+14 −4
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ android_library { 
    srcs: [

        ":NetworkStackApiCurrentShims",

        "src/**/*.java",

        ":statslog-networkstack-java-gen"

        ":statslog-networkstack-java-gen-current"

    ],

    manifest: "AndroidManifestBase.xml",

    enabled: false, // Disabled in mainline-prod
@@ -131,7 +131,7 @@ android_library { 
    defaults: ["NetworkStackReleaseApiLevel"],

    srcs: [

        "src/**/*.java",

        ":statslog-networkstack-java-gen",

        ":statslog-networkstack-java-gen-stable",

    ],

    // API stable uses a jarjared version of the shims

    static_libs: [
@@ -265,14 +265,24 @@ cc_library_shared { 
}



genrule {

    name: "statslog-networkstack-java-gen",

    name: "statslog-networkstack-java-gen-current",

    tools: ["stats-log-api-gen"],

    cmd: "$(location stats-log-api-gen) --java $(out) --module network_stack" +

         " --javaPackage com.android.networkstack.metrics --javaClass NetworkStackStatsLog" +

         " --supportQ",

         " --minApiLevel 29",

    out: ["com/android/networkstack/metrics/NetworkStackStatsLog.java"],

}



genrule {

    name: "statslog-networkstack-java-gen-stable",

    tools: ["stats-log-api-gen"],

    cmd: "$(location stats-log-api-gen) --java $(out) --module network_stack" +

         " --javaPackage com.android.networkstack.metrics --javaClass NetworkStackStatsLog" +

         " --minApiLevel 29 --compileApiLevel 30",

    out: ["com/android/networkstack/metrics/NetworkStackStatsLog.java"],

}





version_code_networkstack_next = "300000000"

version_code_networkstack_test = "999999999"

tests/integration/src/android/net/ip/IpClientIntegrationTest.kt

+24 −2
Original line number Diff line number Diff line
@@ -16,6 +16,14 @@ 


package android.net.ip



import android.net.ipmemorystore.NetworkAttributes

import org.mockito.Mockito.any

import org.mockito.ArgumentCaptor

import org.mockito.Mockito.eq

import org.mockito.Mockito.never

import org.mockito.Mockito.timeout

import org.mockito.Mockito.verify



/**

 * Tests for IpClient, run with signature permissions.

 */
@@ -29,10 +37,24 @@ class IpClientIntegrationTest : IpClientIntegrationTestCommon() { 
    override fun setDhcpFeatures(

        isDhcpLeaseCacheEnabled: Boolean,

        isRapidCommitEnabled: Boolean,

        isDhcpIpConflictDetectEnabled: Boolean

        isDhcpIpConflictDetectEnabled: Boolean,

        isIPv6OnlyPreferredEnabled: Boolean

    ) {

        mDependencies.setDhcpLeaseCacheEnabled(isDhcpLeaseCacheEnabled)

        mDependencies.setDhcpRapidCommitEnabled(isRapidCommitEnabled)

        mDependencies.setDhcpIpConflictDetectEnabled(isDhcpIpConflictDetectEnabled)

        mDependencies.setIPv6OnlyPreferredEnabled(isIPv6OnlyPreferredEnabled)

    }



    override fun getStoredNetworkAttributes(l2Key: String, timeout: Long): NetworkAttributes {

        val networkAttributesCaptor = ArgumentCaptor.forClass(NetworkAttributes::class.java)



        verify(mIpMemoryStore, timeout(timeout))

                .storeNetworkAttributes(eq(l2Key), networkAttributesCaptor.capture(), any())

        return networkAttributesCaptor.value

    }



    override fun assertIpMemoryNeverStoreNetworkAttributes(l2Key: String, timeout: Long) {

        verify(mIpMemoryStore, never()).storeNetworkAttributes(eq(l2Key), any(), any())

    }

}

tests/integration/src/android/net/ip/IpClientIntegrationTestCommon.java

+93 −80

File changed.

Preview size limit exceeded, changes collapsed.

tests/integration/src/android/net/ip/IpClientRootTest.kt

+75 −11
Original line number Diff line number Diff line
@@ -21,6 +21,10 @@ import android.Manifest.permission.READ_DEVICE_CONFIG 
import android.Manifest.permission.WRITE_DEVICE_CONFIG

import android.net.IIpMemoryStore

import android.net.IIpMemoryStoreCallbacks

import android.net.NetworkStackIpMemoryStore

import android.net.ipmemorystore.OnNetworkAttributesRetrievedListener

import android.net.ipmemorystore.NetworkAttributes

import android.net.ipmemorystore.Status

import android.net.networkstack.TestNetworkStackServiceClient

import android.net.util.NetworkStackUtils

import android.os.Process
@@ -28,16 +32,21 @@ import android.provider.DeviceConfig 
import android.util.ArrayMap

import android.util.Log

import androidx.test.platform.app.InstrumentationRegistry

import java.lang.System.currentTimeMillis

import java.util.concurrent.CompletableFuture

import java.util.concurrent.CountDownLatch

import java.util.concurrent.TimeUnit

import java.util.concurrent.TimeoutException

import kotlin.test.assertNotNull

import kotlin.test.assertNull

import kotlin.test.assertTrue

import kotlin.test.fail

import org.junit.After

import org.junit.AfterClass

import org.junit.BeforeClass

import org.mockito.ArgumentCaptor

import org.mockito.Mockito.timeout

import org.mockito.Mockito.verify

import java.lang.System.currentTimeMillis

import java.util.concurrent.CompletableFuture

import java.util.concurrent.TimeUnit

import java.util.concurrent.TimeoutException



// Stable AIDL method 5 in INetworkStackConnector is allowTestUid

private const val ALLOW_TEST_UID_INDEX = 5
@@ -55,6 +64,8 @@ class IpClientRootTest : IpClientIntegrationTestCommon() { 
        private val TAG = IpClientRootTest::class.java.simpleName

        private val automation by lazy { InstrumentationRegistry.getInstrumentation().uiAutomation }

        private lateinit var nsClient: TestNetworkStackServiceClient

        private lateinit var mStore: NetworkStackIpMemoryStore

        private val mContext = InstrumentationRegistry.getInstrumentation().getContext()



        private class IpMemoryStoreCallbacks(

            private val fetchedFuture: CompletableFuture<IIpMemoryStore>
@@ -83,13 +94,13 @@ class IpClientRootTest : IpClientIntegrationTestCommon() { 
                // for a success callback via the service shell command.

                // TODO: build a small native util that also waits for the success callback, bundle

                // it in the test APK, and run it as shell command as root instead.

                waitUntilTestUidAllowed()

                mStore = getIpMemoryStore()

            } finally {

                automation.dropShellPermissionIdentity()

            }

        }



        private fun waitUntilTestUidAllowed() {

        private fun getIpMemoryStore(): NetworkStackIpMemoryStore {

            // Until the test UID is allowed, oneway binder calls will not receive any reply.

            // Call fetchIpMemoryStore (which has limited side-effects) repeatedly until any call

            // gets a callback.
@@ -100,13 +111,14 @@ class IpClientRootTest : IpClientIntegrationTestCommon() { 
                try {

                    nsClient.fetchIpMemoryStore(IpMemoryStoreCallbacks(fetchedFuture))

                    // The future may be completed by any previous call to fetchIpMemoryStore.

                    fetchedFuture.get(20, TimeUnit.MILLISECONDS)

                    Log.i(TAG, "Obtained IpMemoryStore")

                    return

                    val ipMemoryStore = fetchedFuture.get(20, TimeUnit.MILLISECONDS)

                    Log.i(TAG, "Obtained IpMemoryStore: " + ipMemoryStore)

                    return NetworkStackIpMemoryStore(mContext, ipMemoryStore)

                } catch (e: TimeoutException) {

                    // Fall through

                }

            }

            fail("fail to get the IpMemoryStore instance within timeout")

        }



        @JvmStatic @AfterClass
@@ -155,6 +167,17 @@ class IpClientRootTest : IpClientIntegrationTestCommon() { 
        }

    }



    @After

    fun tearDownIpMemoryStore() {

        if (testSkipped()) return

        val latch = CountDownLatch(1)



        // Delete the IpMemoryStore entry corresponding to TEST_L2KEY, make sure each test starts

        // from a clean state.

        mStore.delete(TEST_L2KEY, true) { _, _ -> latch.countDown() }

        assertTrue(latch.await(TEST_TIMEOUT_MS, TimeUnit.MILLISECONDS))

    }



    override fun useNetworkStackSignature() = false



    override fun makeIIpClient(ifaceName: String, cbMock: IIpClientCallbacks): IIpClient {
@@ -174,7 +197,8 @@ class IpClientRootTest : IpClientIntegrationTestCommon() { 
    override fun setDhcpFeatures(

        isDhcpLeaseCacheEnabled: Boolean,

        isRapidCommitEnabled: Boolean,

        isDhcpIpConflictDetectEnabled: Boolean

        isDhcpIpConflictDetectEnabled: Boolean,

        isIPv6OnlyPreferredEnabled: Boolean

    ) {

        automation.adoptShellPermissionIdentity(READ_DEVICE_CONFIG, WRITE_DEVICE_CONFIG)

        try {
@@ -182,6 +206,8 @@ class IpClientRootTest : IpClientIntegrationTestCommon() { 
            setFeatureEnabled(NetworkStackUtils.DHCP_RAPID_COMMIT_VERSION, isRapidCommitEnabled)

            setFeatureEnabled(NetworkStackUtils.DHCP_IP_CONFLICT_DETECT_VERSION,

                    isDhcpIpConflictDetectEnabled)

            setFeatureEnabled(NetworkStackUtils.DHCP_IPV6_ONLY_PREFERRED_VERSION,

                    isIPv6OnlyPreferredEnabled)

        } finally {

            automation.dropShellPermissionIdentity()

        }
@@ -200,4 +226,42 @@ class IpClientRootTest : IpClientIntegrationTestCommon() { 
        DeviceConfig.setProperty(DeviceConfig.NAMESPACE_CONNECTIVITY, feature,

                if (enabled) "1" else "999999999", false)

    }



    private class TestAttributesRetrievedListener : OnNetworkAttributesRetrievedListener {

        private val future = CompletableFuture<NetworkAttributes?>()

        override fun onNetworkAttributesRetrieved(

            status: Status,

            key: String,

            attr: NetworkAttributes?

        ) {

            // NetworkAttributes associated to specific l2key retrieved from IpMemoryStore might be

            // null according to testcase context, hence, make sure the callback is triggered with

            // success and the l2key param return from callback matches, which also prevents the

            // case that the NetworkAttributes haven't been stored within CompletableFuture polling

            // timeout.

            if (key != TEST_L2KEY || status.resultCode != Status.SUCCESS) {

                fail("retrieved the network attributes associated to L2Key: " + key +

                        " status: " + status.resultCode + " attributes: " + attr)

            }

            future.complete(attr)

        }



        fun getBlockingNetworkAttributes(timeout: Long): NetworkAttributes? {

            return future.get(timeout, TimeUnit.MILLISECONDS)

        }

    }



    override fun getStoredNetworkAttributes(l2Key: String, timeout: Long): NetworkAttributes {

        val listener = TestAttributesRetrievedListener()

        mStore.retrieveNetworkAttributes(l2Key, listener)

        val na = listener.getBlockingNetworkAttributes(timeout)

        assertNotNull(na)

        return na

    }



    override fun assertIpMemoryNeverStoreNetworkAttributes(l2Key: String, timeout: Long) {

        val listener = TestAttributesRetrievedListener()

        mStore.retrieveNetworkAttributes(l2Key, listener)

        assertNull(listener.getBlockingNetworkAttributes(timeout))

    }

}