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

Merge "ConnectivityService: safer locking"

Browse Source
This commit is contained in:
Hugo Benichi
2017-04-07 02:10:45 +00:00
committed by Gerrit Code Review
parent 3145827105 475dd68f11
commit 499541673f
1 changed files with 23 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1303,13 +1303,16 @@ public class ConnectivityService extends IConnectivityManager.Stub
@Override @Override
public LinkProperties getLinkProperties(Network network) { public LinkProperties getLinkProperties(Network network) {
enforceAccessPermission(); enforceAccessPermission();
NetworkAgentInfo nai = getNetworkAgentInfoForNetwork(network); return getLinkProperties(getNetworkAgentInfoForNetwork(network));
if (nai != null) { }
synchronized (nai) {
return new LinkProperties(nai.linkProperties); private LinkProperties getLinkProperties(NetworkAgentInfo nai) {
} if (nai == null) {
return null;
}
synchronized (nai) {
return new LinkProperties(nai.linkProperties);
} }
return null;
} }
private NetworkCapabilities getNetworkCapabilitiesInternal(NetworkAgentInfo nai) { private NetworkCapabilities getNetworkCapabilitiesInternal(NetworkAgentInfo nai) {
@@ -3133,7 +3136,8 @@ public class ConnectivityService extends IConnectivityManager.Stub
enforceAccessPermission(); enforceAccessPermission();
enforceInternetPermission(); enforceInternetPermission();
NetworkAgentInfo nai; // TODO: execute this logic on ConnectivityService handler.
final NetworkAgentInfo nai;
if (network == null) { if (network == null) {
nai = getDefaultNetwork(); nai = getDefaultNetwork();
} else { } else {
@@ -3144,21 +3148,24 @@ public class ConnectivityService extends IConnectivityManager.Stub
return; return;
} }
// Revalidate if the app report does not match our current validated state. // Revalidate if the app report does not match our current validated state.
if (hasConnectivity == nai.lastValidated) return; if (hasConnectivity == nai.lastValidated) {
return;
}
final int uid = Binder.getCallingUid(); final int uid = Binder.getCallingUid();
if (DBG) { if (DBG) {
log("reportNetworkConnectivity(" + nai.network.netId + ", " + hasConnectivity + log("reportNetworkConnectivity(" + nai.network.netId + ", " + hasConnectivity +
") by " + uid); ") by " + uid);
} }
synchronized (nai) { // Validating a network that has not yet connected could result in a call to
// Validating a network that has not yet connected could result in a call to // rematchNetworkAndRequests() which is not meant to work on such networks.
// rematchNetworkAndRequests() which is not meant to work on such networks. if (!nai.everConnected) {
if (!nai.everConnected) return; return;
if (isNetworkWithLinkPropertiesBlocked(nai.linkProperties, uid, false)) return;
nai.networkMonitor.sendMessage(NetworkMonitor.CMD_FORCE_REEVALUATION, uid);
} }
LinkProperties lp = getLinkProperties(nai);
if (isNetworkWithLinkPropertiesBlocked(lp, uid, false)) {
return;
}
nai.networkMonitor.sendMessage(NetworkMonitor.CMD_FORCE_REEVALUATION, uid);
} }
private ProxyInfo getDefaultProxy() { private ProxyInfo getDefaultProxy() {