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

[NS A20] Cleanup

Browse Source 
A lot of this code can't be triggered at all.
• newNetwork.created in l.6488 is implied by newNetwork.everConnected
  in l.6357
• !newNetwork.isVPN() in l.6488 is implied by the fact that VPNs are
  always foreground, so oldPermission can't != newPermission in l.6488
• updateUids in l.6502 is useless because uids can't change during a
  rematch (because there is no code doing that). Metered state and
  roaming state similarly can't change during a rematch, so
  meteredChanged and roamingChanged are always false
• updateAllVpnCapabilities in l.6537 is useless because VPN do not
  inherit the foreground state of their underlying networks, which
  would be the only reason to call that in l.6537
• Object.equals() in l.6480 is necessary false because at this line
  it is known that the foreground state has changed, which must have
  caused the NET_CAPABILITY_FOREGROUND to be different, so the objects
  can't be equal

Test: FrameworksNetTests NetworkStackTest
Change-Id: I2a52f7f4a085f3eea22a1dd170af8f04671250ff
This commit is contained in:
Chalard Jean
2019-11-19 22:08:18 +09:00
parent 644939bad5
commit 1c89b21fca
1 changed files with 5 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6470,17 +6470,12 @@ public class ConnectivityService extends IConnectivityManager.Stub
// Second pass: process all listens.
if (wasBackgroundNetwork != newNetwork.isBackgroundNetwork()) {
// TODO : most of the following is useless because the only thing that changed
// here is whether the network is a background network. Clean this up.
NetworkCapabilities newNc = mixInCapabilities(newNetwork,
final NetworkCapabilities newNc = mixInCapabilities(newNetwork,
newNetwork.networkCapabilities);
if (Objects.equals(newNetwork.networkCapabilities, newNc)) return;
final int oldPermission = getNetworkPermission(newNetwork.networkCapabilities);
final int newPermission = getNetworkPermission(newNc);
if (oldPermission != newPermission && newNetwork.created && !newNetwork.isVPN()) {
if (oldPermission != newPermission) {
try {
mNMS.setNetworkPermission(newNetwork.network.netId, newPermission);
} catch (RemoteException e) {
@@ -6488,50 +6483,13 @@ public class ConnectivityService extends IConnectivityManager.Stub
}
}
final NetworkCapabilities prevNc;
synchronized (newNetwork) {
prevNc = newNetwork.networkCapabilities;
newNetwork.setNetworkCapabilities(newNc);
}
updateUids(newNetwork, prevNc, newNc);
if (newNetwork.getCurrentScore() == score
&& newNc.equalRequestableCapabilities(prevNc)) {
// If the requestable capabilities haven't changed, and the score hasn't changed,
// then the change we're processing can't affect any requests, it can only affect
// the listens on this network.
processListenRequests(newNetwork, true);
} else {
rematchAllNetworksAndRequests();
notifyNetworkCallbacks(newNetwork, ConnectivityManager.CALLBACK_CAP_CHANGED);
}
if (prevNc != null) {
final boolean oldMetered = prevNc.isMetered();
final boolean newMetered = newNc.isMetered();
final boolean meteredChanged = oldMetered != newMetered;
if (meteredChanged) {
maybeNotifyNetworkBlocked(newNetwork, oldMetered, newMetered,
mRestrictBackground, mRestrictBackground);
}
final boolean roamingChanged = prevNc.hasCapability(NET_CAPABILITY_NOT_ROAMING)
!= newNc.hasCapability(NET_CAPABILITY_NOT_ROAMING);
// Report changes that are interesting for network statistics tracking.
if (meteredChanged || roamingChanged) {
notifyIfacesChangedForNetworkStats();
}
}
if (!newNc.hasTransport(TRANSPORT_VPN)) {
// Tell VPNs about updated capabilities, since they may need to
// bubble those changes through.
updateAllVpnsCapabilities();
}
// The requestable capabilities and the score can't have changed, therefore the change
// in background can't affect any requests. Only processing the listens is fine.
processListenRequests(newNetwork, true);
} else {
processListenRequests(newNetwork, false);
}