From e51d2c5ade588a9a5b612de0071b5faba29ea21e Mon Sep 17 00:00:00 2001 From: Jaewan Kim Date: Mon, 10 Mar 2014 17:10:51 +0900 Subject: [PATCH] Refactor IpConfiguration from WifiConfiguration Bug: 7606609, Bug: 8687763 Change-Id: I736eb3c73a8ffc8f137a04a5ea66ee564dc2b530 --- core/java/android/net/IpConfiguration.java | 158 +++++++++++++++++++++ 1 file changed, 158 insertions(+) create mode 100644 core/java/android/net/IpConfiguration.java diff --git a/core/java/android/net/IpConfiguration.java b/core/java/android/net/IpConfiguration.java new file mode 100644 index 0000000000..7f835e4b7a --- /dev/null +++ b/core/java/android/net/IpConfiguration.java @@ -0,0 +1,158 @@ +/* + * Copyright (C) 2014 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package android.net; + +import android.net.LinkProperties; +import android.os.Parcel; +import android.os.Parcelable; +import android.util.Log; + +/** + * A class representing a configured network. + */ +public class IpConfiguration implements Parcelable { + private static final String TAG = "IpConfiguration"; + + /** + * @hide + */ + public enum IpAssignment { + /* Use statically configured IP settings. Configuration can be accessed + * with linkProperties */ + STATIC, + /* Use dynamically configured IP settigns */ + DHCP, + /* no IP details are assigned, this is used to indicate + * that any existing IP settings should be retained */ + UNASSIGNED + } + + /** + * @hide + */ + public IpAssignment ipAssignment; + + /** + * @hide + */ + public enum ProxySettings { + /* No proxy is to be used. Any existing proxy settings + * should be cleared. */ + NONE, + /* Use statically configured proxy. Configuration can be accessed + * with linkProperties */ + STATIC, + /* no proxy details are assigned, this is used to indicate + * that any existing proxy settings should be retained */ + UNASSIGNED, + /* Use a Pac based proxy. + */ + PAC + } + + /** + * @hide + */ + public ProxySettings proxySettings; + + /** + * @hide + */ + public LinkProperties linkProperties; + + public IpConfiguration() { + ipAssignment = IpAssignment.UNASSIGNED; + proxySettings = ProxySettings.UNASSIGNED; + linkProperties = new LinkProperties(); + } + + /** copy constructor {@hide} */ + public IpConfiguration(IpConfiguration source) { + if (source != null) { + ipAssignment = source.ipAssignment; + proxySettings = source.proxySettings; + linkProperties = new LinkProperties(source.linkProperties); + } + } + + public static IpConfiguration createDefaultConfiguration() { + IpConfiguration config = new IpConfiguration(); + config.ipAssignment = IpAssignment.DHCP; + config.proxySettings = ProxySettings.NONE; + return config; + } + + public void mergeFrom(IpConfiguration source) { + if (source == null) { + Log.e(TAG, "source is null"); + return; + } + + linkProperties = source.linkProperties; + if (source.ipAssignment != IpAssignment.UNASSIGNED) { + ipAssignment = source.ipAssignment; + } + if (source.proxySettings != ProxySettings.UNASSIGNED) { + proxySettings = source.proxySettings; + } + } + + @Override + public String toString() { + StringBuilder sbuf = new StringBuilder(); + sbuf.append("IP assignment: " + ipAssignment.toString()); + sbuf.append("\n"); + sbuf.append("Proxy settings: " + proxySettings.toString()); + sbuf.append("\n"); + sbuf.append(linkProperties.toString()); + sbuf.append("\n"); + + return sbuf.toString(); + } + + /** Implement the Parcelable interface {@hide} */ + public int describeContents() { + return 0; + } + + /** Implement the Parcelable interface {@hide} */ + public void writeToParcel(Parcel dest, int flags) { + dest.writeString(ipAssignment.name()); + dest.writeString(proxySettings.name()); + dest.writeParcelable(linkProperties, flags); + } + + /** Implement the Parcelable interface {@hide} */ + public static final Creator CREATOR = + new Creator() { + public IpConfiguration createFromParcel(Parcel in) { + IpConfiguration config = new IpConfiguration(); + config.setFromParcel(in); + return config; + } + + public IpConfiguration[] newArray(int size) { + return new IpConfiguration[size]; + } + }; + + protected void setFromParcel(Parcel in) { + ipAssignment = IpAssignment.valueOf(in.readString()); + proxySettings = ProxySettings.valueOf(in.readString()); + linkProperties = in.readParcelable(null); + } +}