commit fa8105ac3387d8a19ca37057e6939b779ee081ea
author Chalard Jean <jchalard@google.com> Tue Nov 19 22:20:55 2019 +0900
committer Chalard Jean <jchalard@google.com> Tue Dec 10 14:15:14 2019 +0900
tree 672cf75b20365b663073c81db50883b6745f313c
parent 1c89b21fca314454eccba5c78e06975e46ae18f5

[NS A21] More cleanup

Test: FrameworksNetTests NetworkStackTests
Change-Id: I4771f2e9151ff16a7045d9c3025ac686f244b22d

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 d96362c..692b050 100644
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -6468,8 +6468,9 @@
         // before LegacyTypeTracker sends legacy broadcasts
         for (NetworkRequestInfo nri : addedRequests) notifyNetworkAvailable(newNetwork, nri);
 
-        // Second pass: process all listens.
-        if (wasBackgroundNetwork != newNetwork.isBackgroundNetwork()) {
+        // Maybe the network changed background states. Update its capabilities.
+        final boolean backgroundChanged = wasBackgroundNetwork != newNetwork.isBackgroundNetwork();
+        if (backgroundChanged) {
             final NetworkCapabilities newNc = mixInCapabilities(newNetwork,
                     newNetwork.networkCapabilities);
 
@@ -6486,13 +6487,10 @@
             synchronized (newNetwork) {
                 newNetwork.setNetworkCapabilities(newNc);
             }
-
-            // The requestable capabilities and the score can't have changed, therefore the change
-            // in background can't affect any requests. Only processing the listens is fine.
-            processListenRequests(newNetwork, true);
-        } else {
-            processListenRequests(newNetwork, false);
         }
+
+        // Finally, process listen requests.
+        processListenRequests(newNetwork, backgroundChanged);
     }
 
     /**