Merge "Fix a bug where a spurious capabilities callback is sent." am: 9ef70c4b

            networkAgent.networkCapabilities.addCapability(NET_CAPABILITY_FOREGROUND);

            if (!createNativeNetwork(networkAgent)) return;

            if (networkAgent.isVPN()) {

                // Initialize the VPN capabilities to their starting values according to the

                // underlying networks. This will avoid a spurious callback to

                // onCapabilitiesUpdated being sent in updateAllVpnCapabilities below as

                // the VPN would switch from its default, blank capabilities to those

                // that reflect the capabilities of its underlying networks.

                updateAllVpnsCapabilities();

            }

            networkAgent.created = true;

        }

        // Even though the VPN is unvalidated, it becomes the default network for our app.

        callback.expectAvailableCallbacksUnvalidated(vpnNetworkAgent);

        // TODO: this looks like a spurious callback.

        callback.expectCallback(CallbackEntry.NETWORK_CAPS_UPDATED, vpnNetworkAgent);

        callback.assertNoCallback();

        assertTrue(vpnNetworkAgent.getScore() > mEthernetNetworkAgent.getScore());