commit 387e7f5ee09f78e82f4cdde05fada49cc0805752
author Chalard Jean <jchalard@google.com> Tue Dec 03 16:06:00 2019 +0900
committer Chalard Jean <jchalard@google.com> Tue Feb 04 16:24:23 2020 +0900
tree 837981e51eb8d839fba980e8d5863de052626d14
parent c1da930d29685f174f335f9238bf97821af298fb

[NS A30] Note linger out of the rematch loop

This doesn't have to be tested every time.

Test: FrameworksNetTests
Change-Id: Ic5702c8b4bd096860fe55c4d9e4c465703561911

services/core/java/com/android/server/ConnectivityService.java

diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java
index 461c3ad..9b0be06 100644
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -6573,11 +6573,6 @@
                 // network.  Think about if there is a way to reduce this.  Push
                 // netid->request mapping to each provider?
                 sendUpdatedScoreToFactories(nri.request, newSatisfier);
-                if (isDefaultRequest(nri)) {
-                    if (previousSatisfier != null) {
-                        mLingerMonitor.noteLingerDefaultNetwork(previousSatisfier, newSatisfier);
-                    }
-                }
             } else {
                 // If "newNetwork" is listed as satisfying "nri" but no longer satisfies "nri",
                 // mark it as no longer satisfying "nri".  Because networks are processed by
@@ -6633,6 +6628,9 @@
                 changes.getNewSatisfier(defaultRequestInfo), oldDefaultNetwork);
 
         if (oldDefaultNetwork != newDefaultNetwork) {
+            if (oldDefaultNetwork != null) {
+                mLingerMonitor.noteLingerDefaultNetwork(oldDefaultNetwork, newDefaultNetwork);
+            }
             updateDataActivityTracking(newDefaultNetwork, oldDefaultNetwork);
             // Notify system services that this network is up.
             makeDefault(newDefaultNetwork);