Merge "Add synchronized to make sure data correctness"

        return mNetworkInfo;

    }

    public int getNetId() {

    /**

     * Return netId of current running VPN network.

     *

     * @return a netId if there is a running VPN network or NETID_UNSET if there is no running VPN

     *         network or network is null.

     */

    public synchronized int getNetId() {

        final NetworkAgent agent = mNetworkAgent;

        if (null == agent) return NETID_UNSET;

        final Network network = agent.getNetwork();

    /**

     * Return the configuration of the currently running VPN.

     */

    public VpnConfig getVpnConfig() {

    public synchronized VpnConfig getVpnConfig() {

        enforceControlPermission();

        return mConfig;

    }