From a6014db9659354ca73514c8b65940493e6f8fe2e Mon Sep 17 00:00:00 2001 From: Chalard Jean Date: Tue, 10 Dec 2019 21:58:23 +0900 Subject: [PATCH] [NS B07] More simplification The new reassignment does not contain these useless lines any more. Test: FrameworksNetTests Change-Id: I1583aebe94e529ce2b36e191a6e1f49c976bf29a --- .../core/java/com/android/server/ConnectivityService.java | 6 ------ 1 file changed, 6 deletions(-) diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java index 90c38fce13..4acedd9496 100644 --- a/services/core/java/com/android/server/ConnectivityService.java +++ b/services/core/java/com/android/server/ConnectivityService.java @@ -6709,10 +6709,6 @@ public class ConnectivityService extends IConnectivityManager.Stub // the linger status. for (final NetworkReassignment.RequestReassignment event : changes.getRequestReassignments()) { - // The rematch is seeded with an entry for each request, and requests that don't - // change satisfiers have the same network as old and new. - // TODO : remove these entries when they are not needed any more. - if (event.mOldNetwork == event.mNewNetwork) continue; updateSatisfiersForRematchRequest(event.mRequest, event.mOldNetwork, event.mNewNetwork, now); } @@ -6741,8 +6737,6 @@ public class ConnectivityService extends IConnectivityManager.Stub // before LegacyTypeTracker sends legacy broadcasts for (final NetworkReassignment.RequestReassignment event : changes.getRequestReassignments()) { - if (event.mOldNetwork == event.mNewNetwork) continue; - // Tell NetworkProviders about the new score, so they can stop // trying to connect if they know they cannot match it. // TODO - this could get expensive if there are a lot of outstanding requests for this