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

Commit ed8837f6 authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN
Browse files

Fix binding to TestNetworkStackService 

TestNetworkStackServiceClient used the production INetworkStackConnector
action in the service component instead of the test action, causing it
to bind to the production service instead of the test service.

The two services are identical apart from access restrictions, so this
was not noticed while the integration tests are running with
MAINLINE_NETWORK_STACK permissions. But when trying to change the test
to use root permissions instead, binding would fail saying that the
permission is missing, as the test service is not being used.

Fix the component to use the TestNetworkStackService action.

Bug: 203175155
Test: atest NetworkStackRootTests with followup change
Change-Id: Ifeb83a3f028ac337b3a8fcff65e97ac040e8179e
parent 2d82fb2b

tests/integration/src/android/net/networkstack/TestNetworkStackServiceClient.kt

+4 −4
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ class TestNetworkStackServiceClient private constructor() : NetworkStackClientBa 
    companion object {

        private val context by lazy { InstrumentationRegistry.getInstrumentation().context }

        private val networkStackVersion by lazy {

            val component = getNetworkStackComponent()

            val component = getNetworkStackComponent(INetworkStackConnector::class.java.name)

            val info = context.packageManager.getPackageInfo(component.packageName, 0 /* flags */)

            info.longVersionCode

        }
@@ -54,8 +54,8 @@ class TestNetworkStackServiceClient private constructor() : NetworkStackClientBa 
            return networkStackVersion == 300000000L || networkStackVersion >= 301100000L

        }



        private fun getNetworkStackComponent(): ComponentName {

            val connectorIntent = Intent(INetworkStackConnector::class.java.name)

        private fun getNetworkStackComponent(connectorAction: String): ComponentName {

            val connectorIntent = Intent(connectorAction)

            return connectorIntent.resolveSystemService(context.packageManager, MATCH_SYSTEM_ONLY)

                    ?: fail("TestNetworkStackService not found")

        }
@@ -71,7 +71,7 @@ class TestNetworkStackServiceClient private constructor() : NetworkStackClientBa 


    private fun init() {

        val bindIntent = Intent(INetworkStackConnector::class.java.name + ".Test")

        bindIntent.component = getNetworkStackComponent()

        bindIntent.component = getNetworkStackComponent(bindIntent.action)

        context.bindService(bindIntent, serviceConnection, Context.BIND_AUTO_CREATE)

    }