commit 933ebfa503b6d8bd891c9777931a95cc0620f47d
author Chalard Jean <jchalard@google.com> Tue Dec 03 23:31:17 2019 +0900
committer Chalard Jean <jchalard@google.com> Tue Feb 04 16:49:54 2020 +0900
tree b7436959afe151a1b441bcd11ea258afdfa205f1
parent 84292aaa46b90465ebbcfd88e6569a4571b0744d

[NS A39] Simplification

If newNetwork is satisfying this request, it means it is the old
satisfier. Plain and simple.

Test: ConnectivityServiceTest
Change-Id: Ic1a5d032801bac476b1c1f53da6f1c4c6056bff0

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 b567887..24a92d0 100644
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -6538,7 +6538,7 @@
                 if (currentNetwork == null || currentNetwork.getCurrentScore() < score) {
                     reassignedRequests.put(nri, newNetwork);
                 }
-            } else if (newNetwork.isSatisfyingRequest(nri.request.requestId)) {
+            } else if (newNetwork == currentNetwork) {
                 reassignedRequests.put(nri, null);
             }
         }