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

Propagate network state changes to the LockdownVpnTracker.

Browse Source 
Bug: 17695048
Change-Id: I10378df0ab545729a6a315fd1bc8870cd98f47b3
This commit is contained in:
Lorenzo Colitti
2014-10-15 16:06:07 +09:00
parent 458470fb16
commit 35495fadb1
1 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
services/core/java/com/android/server/ConnectivityService.java
View File

@@ -2001,9 +2001,7 @@ public class ConnectivityService extends IConnectivityManager.Stub {
} else if (state == NetworkInfo.State.CONNECTED) { } else if (state == NetworkInfo.State.CONNECTED) {
// handleConnect(info); // handleConnect(info);
} }
if (mLockdownTracker != null) { notifyLockdownVpn(null);
mLockdownTracker.onNetworkInfoChanged(info);
}
break; break;
} }
case NetworkStateTracker.EVENT_CONFIGURATION_CHANGED: { case NetworkStateTracker.EVENT_CONFIGURATION_CHANGED: {
@@ -2126,6 +2124,7 @@ public class ConnectivityService extends IConnectivityManager.Stub {
if (nai.networkRequests.get(mDefaultRequest.requestId) != null) { if (nai.networkRequests.get(mDefaultRequest.requestId) != null) {
removeDataActivityTracking(nai); removeDataActivityTracking(nai);
mActiveDefaultNetwork = ConnectivityManager.TYPE_NONE; mActiveDefaultNetwork = ConnectivityManager.TYPE_NONE;
notifyLockdownVpn(nai);
requestNetworkTransitionWakelock(nai.name()); requestNetworkTransitionWakelock(nai.name());
} }
for (NetworkAgentInfo networkToActivate : toActivate) { for (NetworkAgentInfo networkToActivate : toActivate) {
@@ -3801,6 +3800,7 @@ public class ConnectivityService extends IConnectivityManager.Stub {
} catch (Exception e) { } catch (Exception e) {
loge("Exception setting default network :" + e); loge("Exception setting default network :" + e);
} }
notifyLockdownVpn(newNetwork);
handleApplyDefaultProxy(newNetwork.linkProperties.getHttpProxy()); handleApplyDefaultProxy(newNetwork.linkProperties.getHttpProxy());
updateTcpBufferSizes(newNetwork); updateTcpBufferSizes(newNetwork);
} }
@@ -3916,6 +3916,7 @@ public class ConnectivityService extends IConnectivityManager.Stub {
} }
mDefaultInetConditionPublished = newNetwork.validated ? 100 : 0; mDefaultInetConditionPublished = newNetwork.validated ? 100 : 0;
mLegacyTypeTracker.add(newNetwork.networkInfo.getType(), newNetwork); mLegacyTypeTracker.add(newNetwork.networkInfo.getType(), newNetwork);
notifyLockdownVpn(newNetwork);
} }
} }
} }
@@ -4035,6 +4036,16 @@ public class ConnectivityService extends IConnectivityManager.Stub {
sendInetConditionBroadcast(nai.networkInfo); sendInetConditionBroadcast(nai.networkInfo);
} }
private void notifyLockdownVpn(NetworkAgentInfo nai) {
if (mLockdownTracker != null) {
if (nai != null && nai.isVPN()) {
mLockdownTracker.onVpnStateChanged(nai.networkInfo);
} else {
mLockdownTracker.onNetworkInfoChanged();
}
}
}
private void updateNetworkInfo(NetworkAgentInfo networkAgent, NetworkInfo newInfo) { private void updateNetworkInfo(NetworkAgentInfo networkAgent, NetworkInfo newInfo) {
NetworkInfo.State state = newInfo.getState(); NetworkInfo.State state = newInfo.getState();
NetworkInfo oldInfo = null; NetworkInfo oldInfo = null;
@@ -4042,9 +4053,7 @@ public class ConnectivityService extends IConnectivityManager.Stub {
oldInfo = networkAgent.networkInfo; oldInfo = networkAgent.networkInfo;
networkAgent.networkInfo = newInfo; networkAgent.networkInfo = newInfo;
} }
if (networkAgent.isVPN() && mLockdownTracker != null) { notifyLockdownVpn(networkAgent);
mLockdownTracker.onVpnStateChanged(newInfo);
}
if (oldInfo != null && oldInfo.getState() == state) { if (oldInfo != null && oldInfo.getState() == state) {
if (VDBG) log("ignoring duplicate network state non-change"); if (VDBG) log("ignoring duplicate network state non-change");