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

Merge "Add NetworkProperties to DataConnection."

Browse Source
This commit is contained in:
Wink Saville
2010-08-27 11:38:48 -07:00
committed by Android (Google) Code Review
parent 46403bf739 7d85790ad8
commit 78f04d105c
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/android/net/NetworkProperties.java
View File

@@ -99,19 +99,20 @@ public class NetworkProperties implements Parcelable {
return 0;
}
@Override
public synchronized String toString() {
String ifaceName = (mIface == null ? "" : "InterfaceName: " + mIface.getName() + " ");
String ip = "IpAddresses: [";
for (InetAddress addr : mAddresses) ip += addr.toString() + ",";
for (InetAddress addr : mAddresses) ip += addr.getHostAddress() + ",";
ip += "] ";
String dns = "DnsAddresses: [";
for (InetAddress addr : mDnses) dns += addr.toString() + ",";
for (InetAddress addr : mDnses) dns += addr.getHostAddress() + ",";
dns += "] ";
String proxy = (mHttpProxy == null ? "" : "HttpProxy: " + mHttpProxy.toString() + " ");
String gateway = (mGateway == null ? "" : "Gateway: " + mGateway.toString() + " ");
String gateway = (mGateway == null ? "" : "Gateway: " + mGateway.getHostAddress() + " ");
return ifaceName + ip + gateway + dns + proxy;
}

8
core/java/android/net/ProxyProperties.java
View File

@@ -57,6 +57,14 @@ public class ProxyProperties implements Parcelable {
mExclusionList = exclusionList;
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append(mProxy.getHostAddress()).append(":").append(mPort)
.append(" xl=").append(mExclusionList);
return sb.toString();
}
/**
* Implement the Parcelable interface
* @hide