joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

am 2f1e953f: am 4df65bf1: Merge "Direct notification of network interface changes." into lmp-mr1-dev

Browse source 
* commit '2f1e953f8fd6d7ee32c00a680f887607f1005f62':
  Direct notification of network interface changes.
This commit is contained in:
Jeff Sharkey 2014-12-09 00:18:01 +00:00 • committed by Android Git Automerger
commit 86af3b6061
1 changed files with 15 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

15
services/core/java/com/android/server/ConnectivityService.java
View file

@ -231,6 +231,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
private static ConnectivityService sServiceInstance;
private INetworkManagementService mNetd;
private INetworkStatsService mStatsService;
private INetworkPolicyManager mPolicyManager;
private String mCurrentTcpBufferSizes;
@ -630,6 +631,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
mContext = checkNotNull(context, "missing Context");
mNetd = checkNotNull(netManager, "missing INetworkManagementService");
mStatsService = checkNotNull(statsService, "missing INetworkStatsService");
mPolicyManager = checkNotNull(policyManager, "missing INetworkPolicyManager");
mKeyStore = KeyStore.getInstance();
mTelephonyManager = (TelephonyManager) mContext.getSystemService(Context.TELEPHONY_SERVICE);
@ -2166,6 +2168,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
if (isDefaultNetwork(nai)) {
mDefaultInetConditionPublished = 0;
}
notifyIfacesChanged();
notifyNetworkCallbacks(nai, ConnectivityManager.CALLBACK_LOST);
nai.networkMonitor.sendMessage(NetworkMonitor.CMD_NETWORK_DISCONNECTED);
mNetworkAgentInfos.remove(msg.replyTo);
@ -3660,6 +3663,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
if (isDefaultNetwork(networkAgent)) handleApplyDefaultProxy(newLp.getHttpProxy());
// TODO - move this check to cover the whole function
if (!Objects.equals(newLp, oldLp)) {
notifyIfacesChanged();
notifyNetworkCallbacks(networkAgent, ConnectivityManager.CALLBACK_IP_CHANGED);
}
}
@ -4250,6 +4254,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
}
networkAgent.created = true;
updateLinkProperties(networkAgent, null);
notifyIfacesChanged();
notifyNetworkCallbacks(networkAgent, ConnectivityManager.CALLBACK_PRECHECK);
networkAgent.networkMonitor.sendMessage(NetworkMonitor.CMD_NETWORK_CONNECTED);
if (networkAgent.isVPN()) {
@ -4393,6 +4398,16 @@ public class ConnectivityService extends IConnectivityManager.Stub
return "UNKNOWN";
}
/**
* Notify other system services that set of active ifaces has changed.
*/
private void notifyIfacesChanged() {
try {
mStatsService.forceUpdateIfaces();
} catch (Exception ignored) {
}
}
@Override
public boolean addVpnAddress(String address, int prefixLength) {
throwIfLockdownEnabled();