commit 45fc56962c5db679d0b32e1d446948fbef6a1e27
author Rubin Xu <rubinxu@google.com> Thu May 09 12:49:40 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu May 09 12:49:40 2019 +0000
tree 048c23d512204087b8f0c7fe34bb0c4785d6f2dc
parent 3423014cbea60f9454c1360891bc6ca7d247548f
parent 307c525382d5f1454e37a0ae9d785fec71306264

Merge "Do not disconnect existing VPN if seamless handover fails"

services/core/java/com/android/server/connectivity/Vpn.java

diff --git a/services/core/java/com/android/server/connectivity/Vpn.java b/services/core/java/com/android/server/connectivity/Vpn.java
index 0271d3b..1275302 100644
--- a/services/core/java/com/android/server/connectivity/Vpn.java
+++ b/services/core/java/com/android/server/connectivity/Vpn.java
@@ -1141,7 +1141,11 @@
             }
         } catch (RuntimeException e) {
             IoUtils.closeQuietly(tun);
-            agentDisconnect();
+            // If this is not seamless handover, disconnect partially-established network when error
+            // occurs.
+            if (oldNetworkAgent != mNetworkAgent) {
+                agentDisconnect();
+            }
             // restore old state
             mConfig = oldConfig;
             mConnection = oldConnection;