Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove useless code"

Browse Source
This commit is contained in:
Treehugger Robot
2020-11-06 11:02:23 +00:00
committed by Gerrit Code Review
parent ffcc7427a8 c74389c5fc
commit 646cf23c3c
1 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
services/core/java/com/android/server/connectivity/Vpn.java
View File

@@ -25,6 +25,7 @@ import static android.net.NetworkCapabilities.NET_CAPABILITY_NOT_SUSPENDED;
import static android.net.RouteInfo.RTN_THROW; import static android.net.RouteInfo.RTN_THROW;
import static android.net.RouteInfo.RTN_UNREACHABLE; import static android.net.RouteInfo.RTN_UNREACHABLE;
import static com.android.internal.util.Preconditions.checkArgument;
import static com.android.internal.util.Preconditions.checkNotNull; import static com.android.internal.util.Preconditions.checkNotNull;
import android.Manifest; import android.Manifest;
@@ -2759,6 +2760,8 @@ public class Vpn {
LegacyVpnRunner(VpnConfig config, String[] racoon, String[] mtpd, VpnProfile profile) { LegacyVpnRunner(VpnConfig config, String[] racoon, String[] mtpd, VpnProfile profile) {
super(TAG); super(TAG);
checkArgument(racoon != null || mtpd != null, "Arguments to racoon and mtpd "
+ "must not both be null");
mConfig = config; mConfig = config;
mDaemons = new String[] {"racoon", "mtpd"}; mDaemons = new String[] {"racoon", "mtpd"};
// TODO: clear arguments from memory once launched // TODO: clear arguments from memory once launched
@@ -2915,15 +2918,6 @@ public class Vpn {
} }
new File("/data/misc/vpn/abort").delete(); new File("/data/misc/vpn/abort").delete();
// Check if we need to restart any of the daemons.
boolean restart = false;
for (String[] arguments : mArguments) {
restart = restart || (arguments != null);
}
if (!restart) {
agentDisconnect();
return;
}
updateState(DetailedState.CONNECTING, "execute"); updateState(DetailedState.CONNECTING, "execute");
// Start the daemon with arguments. // Start the daemon with arguments.