Merge "Do not capture argument from ServiceListing.Callback" into tm-qpr-dev...

    override var currentUserId = userTracker.userId

        private set

    private val serviceListingCallback = ServiceListing.Callback {

    private val serviceListingCallback = ServiceListing.Callback { list ->

        Log.d(TAG, "ServiceConfig reloaded, count: ${list.size}")

        val newServices = list.map { ControlsServiceInfo(userTracker.userContext, it) }

        // After here, `list` is not captured, so we don't risk modifying it outside of the callback

        backgroundExecutor.execute {

            if (userChangeInProgress.get() > 0) return@execute

            Log.d(TAG, "ServiceConfig reloaded, count: ${it.size}")

            val newServices = it.map { ControlsServiceInfo(userTracker.userContext, it) }

            if (featureFlags.isEnabled(Flags.USE_APP_PANELS)) {

                newServices.forEach(ControlsServiceInfo::resolvePanelActivity)

            }

import org.junit.After

import org.junit.Assert.assertEquals

import org.junit.Assert.assertNull

import org.junit.Assert.assertTrue

import org.junit.Before

import org.junit.Test

import org.junit.runner.RunWith

        assertNull(controller.getCurrentServices()[0].panelActivity)

    }

    @Test

    fun testListingsNotModifiedByCallback() {

        // This test checks that if the list passed to the callback is modified, it has no effect

        // in the resulting services

        val list = mutableListOf<ServiceInfo>()

        serviceListingCallbackCaptor.value.onServicesReloaded(list)

        list.add(ServiceInfo(ComponentName("a", "b")))

        executor.runAllReady()

        assertTrue(controller.getCurrentServices().isEmpty())

    }

    private fun ServiceInfo(

            componentName: ComponentName,

            panelActivityComponentName: ComponentName? = null