LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Hide IpConfiguration"

Browse Source 
This reverts commit 3b81925ae8.

Change-Id: I5728114dbd9ef37509e8ab3c942648ec92ef0c1a
This commit is contained in:
Jaewan Kim
2014-04-07 08:54:45 +00:00
parent 3b81925ae8
commit 6a9403215a
1 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
core/java/android/net/IpConfiguration.java
View File

@@ -23,11 +23,13 @@ import android.util.Log;
/** /**
* A class representing a configured network. * A class representing a configured network.
* @hide
*/ */
public class IpConfiguration implements Parcelable { public class IpConfiguration implements Parcelable {
private static final String TAG = "IpConfiguration"; private static final String TAG = "IpConfiguration";
/**
* @hide
*/
public enum IpAssignment { public enum IpAssignment {
/* Use statically configured IP settings. Configuration can be accessed /* Use statically configured IP settings. Configuration can be accessed
* with linkProperties */ * with linkProperties */
@@ -39,8 +41,14 @@ public class IpConfiguration implements Parcelable {
UNASSIGNED UNASSIGNED
} }
/**
* @hide
*/
public IpAssignment ipAssignment; public IpAssignment ipAssignment;
/**
* @hide
*/
public enum ProxySettings { public enum ProxySettings {
/* No proxy is to be used. Any existing proxy settings /* No proxy is to be used. Any existing proxy settings
* should be cleared. */ * should be cleared. */
@@ -56,8 +64,14 @@ public class IpConfiguration implements Parcelable {
PAC PAC
} }
/**
* @hide
*/
public ProxySettings proxySettings; public ProxySettings proxySettings;
/**
* @hide
*/
public LinkProperties linkProperties; public LinkProperties linkProperties;
public IpConfiguration() { public IpConfiguration() {
@@ -66,7 +80,7 @@ public class IpConfiguration implements Parcelable {
linkProperties = new LinkProperties(); linkProperties = new LinkProperties();
} }
/** copy constructor */ /** copy constructor {@hide} */
public IpConfiguration(IpConfiguration source) { public IpConfiguration(IpConfiguration source) {
if (source != null) { if (source != null) {
ipAssignment = source.ipAssignment; ipAssignment = source.ipAssignment;
@@ -110,19 +124,19 @@ public class IpConfiguration implements Parcelable {
return sbuf.toString(); return sbuf.toString();
} }
/** Implement the Parcelable interface */ /** Implement the Parcelable interface {@hide} */
public int describeContents() { public int describeContents() {
return 0; return 0;
} }
/** Implement the Parcelable interface */ /** Implement the Parcelable interface {@hide} */
public void writeToParcel(Parcel dest, int flags) { public void writeToParcel(Parcel dest, int flags) {
dest.writeString(ipAssignment.name()); dest.writeString(ipAssignment.name());
dest.writeString(proxySettings.name()); dest.writeString(proxySettings.name());
dest.writeParcelable(linkProperties, flags); dest.writeParcelable(linkProperties, flags);
} }
/** Implement the Parcelable interface */ /** Implement the Parcelable interface {@hide} */
public static final Creator<IpConfiguration> CREATOR = public static final Creator<IpConfiguration> CREATOR =
new Creator<IpConfiguration>() { new Creator<IpConfiguration>() {
public IpConfiguration createFromParcel(Parcel in) { public IpConfiguration createFromParcel(Parcel in) {