Merge "Do not query CS in NetworkProvider constructor" am: 692a8748

    private final Messenger mMessenger;

    private final String mName;

    private final ConnectivityManager mCm;

    private final Context mContext;

    private int mProviderId = ID_NONE;

     */

    @SystemApi

    public NetworkProvider(@NonNull Context context, @NonNull Looper looper, @NonNull String name) {

        mCm = ConnectivityManager.from(context);

        Handler handler = new Handler(looper) {

            @Override

            public void handleMessage(Message m) {

                }

            }

        };

        mContext = context;

        mMessenger = new Messenger(handler);

        mName = name;

    }

    @SystemApi

    @RequiresPermission(android.Manifest.permission.NETWORK_FACTORY)

    public void declareNetworkRequestUnfulfillable(@NonNull NetworkRequest request) {

        mCm.declareNetworkRequestUnfulfillable(request);

        ConnectivityManager.from(mContext).declareNetworkRequestUnfulfillable(request);

    }

}

import org.junit.Before

import org.junit.Test

import org.junit.runner.RunWith

import org.mockito.Mockito.doReturn

import org.mockito.Mockito.mock

import org.mockito.Mockito.verifyNoMoreInteractions

import java.util.UUID

import kotlin.test.assertEquals

import kotlin.test.assertNotEquals

        ) = seenEvents.poll(DEFAULT_TIMEOUT_MS) { it is T && predicate(it) }

    }

    private fun createNetworkProvider(): TestNetworkProvider {

        return TestNetworkProvider(context, mHandlerThread.looper)

    private fun createNetworkProvider(ctx: Context = context): TestNetworkProvider {

        return TestNetworkProvider(ctx, mHandlerThread.looper)

    }

    @Test

    @Test

    fun testDeclareNetworkRequestUnfulfillable() {

        val provider = createNetworkProvider()

        val mockContext = mock(Context::class.java)

        val provider = createNetworkProvider(mockContext)

        // ConnectivityManager not required at creation time

        verifyNoMoreInteractions(mockContext)

        doReturn(mCm).`when`(mockContext).getSystemService(Context.CONNECTIVITY_SERVICE)

        mCm.registerNetworkProvider(provider)

        val specifier = StringNetworkSpecifier(UUID.randomUUID().toString())