Merge changes If7d41052,I66f263d7,Id45ae956,Iba752fed,I575a7e4f, ... into qt-r1-dev

    /** Force update of ifaces. */

    void forceUpdateIfaces(

         in Network[] defaultNetworks,

         in VpnInfo[] vpnArray,

         in NetworkState[] networkStates,

         in String activeIface);

    /** Force update of statistics. */

import android.os.Parcel;

import android.os.Parcelable;

import java.util.Arrays;

/**

 * A lightweight container used to carry information of the ongoing VPN.

 * Internal use only..

public class VpnInfo implements Parcelable {

    public int ownerUid;

    public String vpnIface;

    public String primaryUnderlyingIface;

    public String[] underlyingIfaces;

    @Override

    public String toString() {

        return "VpnInfo{"

                + "ownerUid=" + ownerUid

                + ", vpnIface='" + vpnIface + '\''

                + ", primaryUnderlyingIface='" + primaryUnderlyingIface + '\''

                + ", underlyingIfaces='" + Arrays.toString(underlyingIfaces) + '\''

                + '}';

    }

    public void writeToParcel(Parcel dest, int flags) {

        dest.writeInt(ownerUid);

        dest.writeString(vpnIface);

        dest.writeString(primaryUnderlyingIface);

        dest.writeStringArray(underlyingIfaces);

    }

    public static final Parcelable.Creator<VpnInfo> CREATOR = new Parcelable.Creator<VpnInfo>() {

            VpnInfo info = new VpnInfo();

            info.ownerUid = source.readInt();

            info.vpnIface = source.readString();

            info.primaryUnderlyingIface = source.readString();

            info.underlyingIfaces = source.readStringArray();

            return info;

        }