Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 61c0f547: Merge "Add interface name for proxy network type." into klp-modular-dev

Browse Source 
* commit '61c0f547339ec870d42b15e84f9628631308f22f':
  Add interface name for proxy network type.
This commit is contained in:
Hui Lu
2014-06-05 17:39:09 +00:00
committed by Android Git Automerger
parent 21483b9f0b 61c0f54733
commit 26f40cc36d
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -48,6 +48,7 @@ public class ProxyDataTracker extends BaseNetworkStateTracker {
// TODO: investigate how to get these DNS addresses from the system.
private static final String DNS1 = "8.8.8.8";
private static final String DNS2 = "8.8.4.4";
private static final String INTERFACE_NAME = "ifb0";
private static final String REASON_ENABLED = "enabled";
private static final String REASON_DISABLED = "disabled";
private static final String REASON_PROXY_DOWN = "proxy_down";
@@ -107,10 +108,11 @@ public class ProxyDataTracker extends BaseNetworkStateTracker {
mLinkCapabilities = new LinkCapabilities();
mNetworkInfo.setIsAvailable(true);
try {
mLinkProperties.addDns(InetAddress.getByName(DNS1));
mLinkProperties.addDns(InetAddress.getByName(DNS2));
mLinkProperties.addDns(InetAddress.getByName(DNS1));
mLinkProperties.addDns(InetAddress.getByName(DNS2));
mLinkProperties.setInterfaceName(INTERFACE_NAME);
} catch (UnknownHostException e) {
Log.e(TAG, "Could not add DNS address", e);
Log.e(TAG, "Could not add DNS address", e);
}
}