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

Commit 6641b1b3 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix VPN retry timer mechanism" am: 78b6cfbe am: a76cb185 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2281570



Change-Id: I94172bbf49ff1adc754359d72d2f267be8256e43
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b537f11c a76cb185

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

+5 −1
Original line number Diff line number Diff line
@@ -2928,7 +2928,6 @@ public class Vpn { 
                    ikeConfiguration.isIkeExtensionEnabled(

                            IkeSessionConfiguration.EXTENSION_TYPE_MOBIKE);

            onIkeConnectionInfoChanged(token, ikeConfiguration.getIkeSessionConnectionInfo());

            mRetryCount = 0;

        }



        /**
@@ -3048,6 +3047,7 @@ public class Vpn { 
                }



                doSendLinkProperties(networkAgent, lp);

                mRetryCount = 0;

            } catch (Exception e) {

                Log.d(TAG, "Error in ChildOpened for token " + token, e);

                onSessionLost(token, e);
@@ -3345,6 +3345,10 @@ public class Vpn { 
        }



        private void scheduleRetryNewIkeSession() {

            if (mScheduledHandleRetryIkeSessionFuture != null) {

                Log.d(TAG, "There is a pending retrying task, skip the new retrying task");

                return;

            }

            final long retryDelay = mDeps.getNextRetryDelaySeconds(mRetryCount++);

            Log.d(TAG, "Retry new IKE session after " + retryDelay + " seconds.");

            // If the default network is lost during the retry delay, the mActiveNetwork will be