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

Merge "Remove lock inversion in LegacyVpnRunner" am: 303762dce1

Browse Source 
Change-Id: I0713d3dc61339c14878894a7e619777126d5d9a6
This commit is contained in:
Automerger Merge Worker
2020-03-11 00:43:43 +00:00
parent bff28a86b4 303762dce1
commit 9c14210258
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2563,7 +2563,7 @@ public class Vpn {
public void exitIfOuterInterfaceIs(String interfaze) { public void exitIfOuterInterfaceIs(String interfaze) {
if (interfaze.equals(mOuterInterface)) { if (interfaze.equals(mOuterInterface)) {
Log.i(TAG, "Legacy VPN is going down with " + interfaze); Log.i(TAG, "Legacy VPN is going down with " + interfaze);
exit(); exitVpnRunner();
} }
} }
@@ -2572,6 +2572,10 @@ public class Vpn {
public void exitVpnRunner() { public void exitVpnRunner() {
// We assume that everything is reset after stopping the daemons. // We assume that everything is reset after stopping the daemons.
interrupt(); interrupt();
// Always disconnect. This may be called again in cleanupVpnStateLocked() if
// exitVpnRunner() was called from exit(), but it will be a no-op.
agentDisconnect();
try { try {
mContext.unregisterReceiver(mBroadcastReceiver); mContext.unregisterReceiver(mBroadcastReceiver);
} catch (IllegalArgumentException e) {} } catch (IllegalArgumentException e) {}
@@ -2794,7 +2798,7 @@ public class Vpn {
} catch (Exception e) { } catch (Exception e) {
Log.i(TAG, "Aborting", e); Log.i(TAG, "Aborting", e);
updateState(DetailedState.FAILED, e.getMessage()); updateState(DetailedState.FAILED, e.getMessage());
exit(); exitVpnRunner();
} }
} }