Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit acc5bd41 authored by Rubin Xu's avatar Rubin Xu Committed by android-build-merger
Browse files

Merge "Do not disconnect existing VPN if seamless handover fails" am: 45fc5696 am: 1c33b078 

am: 07287755

Change-Id: I5180d2ca98097f1b48c5020c2d639b77065a6717
parents 4ff2d8f9 07287755

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

+5 −1
Original line number Original line Diff line number Diff line
@@ -1141,7 +1141,11 @@ public class Vpn { 
            }

            }

        } catch (RuntimeException e) {

        } catch (RuntimeException e) {

            IoUtils.closeQuietly(tun);

            IoUtils.closeQuietly(tun);

            // If this is not seamless handover, disconnect partially-established network when error

            // occurs.

            if (oldNetworkAgent != mNetworkAgent) {

                agentDisconnect();

                agentDisconnect();

            }

            // restore old state

            // restore old state

            mConfig = oldConfig;

            mConfig = oldConfig;

            mConnection = oldConnection;

            mConnection = oldConnection;