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

Merge "Remove unused mDnsOverridden"

Browse Source
This commit is contained in:
Geremy Condra
2013-07-26 17:48:54 +00:00
committed by Android (Google) Code Review
parent 63ac2f7d54 5fdc14656c
commit 1fea7c4bdd
1 changed files with 5 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
services/java/com/android/server/ConnectivityService.java
View File

@@ -235,7 +235,6 @@ public class ConnectivityService extends IConnectivityManager.Stub {
private Object mDnsLock = new Object(); private Object mDnsLock = new Object();
private int mNumDnsEntries; private int mNumDnsEntries;
private boolean mDnsOverridden = false;
private boolean mTestMode; private boolean mTestMode;
private static ConnectivityService sServiceInstance; private static ConnectivityService sServiceInstance;
@@ -309,29 +308,23 @@ public class ConnectivityService extends IConnectivityManager.Stub {
*/ */
private static final int EVENT_SET_DEPENDENCY_MET = 10; private static final int EVENT_SET_DEPENDENCY_MET = 10;
/**
* used internally to restore DNS properties back to the
* default network
*/
private static final int EVENT_RESTORE_DNS = 11;
/** /**
* used internally to send a sticky broadcast delayed. * used internally to send a sticky broadcast delayed.
*/ */
private static final int EVENT_SEND_STICKY_BROADCAST_INTENT = 12; private static final int EVENT_SEND_STICKY_BROADCAST_INTENT = 11;
/** /**
* Used internally to * Used internally to
* {@link NetworkStateTracker#setPolicyDataEnable(boolean)}. * {@link NetworkStateTracker#setPolicyDataEnable(boolean)}.
*/ */
private static final int EVENT_SET_POLICY_DATA_ENABLE = 13; private static final int EVENT_SET_POLICY_DATA_ENABLE = 12;
private static final int EVENT_VPN_STATE_CHANGED = 14; private static final int EVENT_VPN_STATE_CHANGED = 13;
/** /**
* Used internally to disable fail fast of mobile data * Used internally to disable fail fast of mobile data
*/ */
private static final int EVENT_ENABLE_FAIL_FAST_MOBILE_DATA = 15; private static final int EVENT_ENABLE_FAIL_FAST_MOBILE_DATA = 14;
/** Handler used for internal events. */ /** Handler used for internal events. */
private InternalHandler mHandler; private InternalHandler mHandler;
@@ -2661,10 +2654,8 @@ public class ConnectivityService extends IConnectivityManager.Stub {
if (mNetConfigs[netType].isDefault()) { if (mNetConfigs[netType].isDefault()) {
String network = nt.getNetworkInfo().getTypeName(); String network = nt.getNetworkInfo().getTypeName();
synchronized (mDnsLock) { synchronized (mDnsLock) {
if (!mDnsOverridden) {
updateDnsLocked(network, p.getInterfaceName(), dnses, p.getDomains(), true); updateDnsLocked(network, p.getInterfaceName(), dnses, p.getDomains(), true);
} }
}
} else { } else {
try { try {
mNetd.setDnsServersForInterface(p.getInterfaceName(), mNetd.setDnsServersForInterface(p.getInterfaceName(),
@@ -2916,13 +2907,6 @@ public class ConnectivityService extends IConnectivityManager.Stub {
handleSetDependencyMet(msg.arg2, met); handleSetDependencyMet(msg.arg2, met);
break; break;
} }
case EVENT_RESTORE_DNS:
{
if (mActiveDefaultNetwork != -1) {
handleDnsConfigurationChange(mActiveDefaultNetwork);
}
break;
}
case EVENT_SEND_STICKY_BROADCAST_INTENT: case EVENT_SEND_STICKY_BROADCAST_INTENT:
{ {
Intent intent = (Intent)msg.obj; Intent intent = (Intent)msg.obj;
@@ -3562,12 +3546,6 @@ public class ConnectivityService extends IConnectivityManager.Stub {
} }
public void restore() { public void restore() {
synchronized (mDnsLock) {
if (mDnsOverridden) {
mDnsOverridden = false;
mHandler.sendEmptyMessage(EVENT_RESTORE_DNS);
}
}
synchronized (mProxyLock) { synchronized (mProxyLock) {
mDefaultProxyDisabled = false; mDefaultProxyDisabled = false;
if (mGlobalProxy == null && mDefaultProxy != null) { if (mGlobalProxy == null && mDefaultProxy != null) {