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

Merge "Remove unused mDnsOverridden" am: 45a5bf908e

Browse Source 
Original change: undetermined

Change-Id: I9e0ea7ac17ec718d84d4d57a4ed2d176ff7ccf72
This commit is contained in:
Geremy Condra
2021-05-31 06:25:25 +00:00
committed by Automerger Merge Worker
parent 1042b37eca 45a5bf908e
commit e6b5691142
1 changed files with 5 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
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 int mNumDnsEntries;
private boolean mDnsOverridden = false;
private boolean mTestMode;
private static ConnectivityService sServiceInstance;
@@ -309,29 +308,23 @@ public class ConnectivityService extends IConnectivityManager.Stub {
*/
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.
*/
private static final int EVENT_SEND_STICKY_BROADCAST_INTENT = 12;
private static final int EVENT_SEND_STICKY_BROADCAST_INTENT = 11;
/**
* Used internally to
* {@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
*/
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. */
private InternalHandler mHandler;
@@ -2661,9 +2654,7 @@ public class ConnectivityService extends IConnectivityManager.Stub {
if (mNetConfigs[netType].isDefault()) {
String network = nt.getNetworkInfo().getTypeName();
synchronized (mDnsLock) {
if (!mDnsOverridden) {
updateDnsLocked(network, p.getInterfaceName(), dnses, p.getDomains(), true);
}
updateDnsLocked(network, p.getInterfaceName(), dnses, p.getDomains(), true);
}
} else {
try {
@@ -2916,13 +2907,6 @@ public class ConnectivityService extends IConnectivityManager.Stub {
handleSetDependencyMet(msg.arg2, met);
break;
}
case EVENT_RESTORE_DNS:
{
if (mActiveDefaultNetwork != -1) {
handleDnsConfigurationChange(mActiveDefaultNetwork);
}
break;
}
case EVENT_SEND_STICKY_BROADCAST_INTENT:
{
Intent intent = (Intent)msg.obj;
@@ -3562,12 +3546,6 @@ public class ConnectivityService extends IConnectivityManager.Stub {
}
public void restore() {
synchronized (mDnsLock) {
if (mDnsOverridden) {
mDnsOverridden = false;
mHandler.sendEmptyMessage(EVENT_RESTORE_DNS);
}
}
synchronized (mProxyLock) {
mDefaultProxyDisabled = false;
if (mGlobalProxy == null && mDefaultProxy != null) {