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

Commit 13bab234 authored by Chalard Jean's avatar Chalard Jean
Browse files

[NS A34] Still more simplification 

Test: ConnectivityServiceTest
Change-Id: I85247411eb8fdfb3eae0e7c309ea9537e41cfb80
parent 6d00610f

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

+1 −2
Original line number Diff line number Diff line
@@ -6572,7 +6572,6 @@ public class ConnectivityService extends IConnectivityManager.Stub 
                    if (VDBG || DDBG) log("   accepting network in place of null");

                }

                newSatisfier.unlingerRequest(nri.request);

                nri.mSatisfier = newSatisfier;

                if (!newSatisfier.addRequest(nri.request)) {

                    Slog.wtf(TAG, "BUG: " + newSatisfier.name() + " already has " + nri.request);

                }
@@ -6589,8 +6588,8 @@ public class ConnectivityService extends IConnectivityManager.Stub 
                            " request " + nri.request.requestId);

                }

                newNetwork.removeRequest(nri.request.requestId);

                nri.mSatisfier = null;

            }

            nri.mSatisfier = newSatisfier;

            // 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