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

Commit 66257d5c authored by Chalard Jean's avatar Chalard Jean
Browse files

Remove useless thread checks 

Because we liked to be really sure.

Test: ConnectivityServiceTests
Change-Id: I8d66257777d4c5b6ca097a5f2575d0872fae05dd
parent 458a9a25

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

+0 −4
Original line number Diff line number Diff line
@@ -3295,7 +3295,6 @@ public class ConnectivityService extends IConnectivityManager.Stub 
        for (int i = 0; i < nai.numNetworkRequests(); i++) {

            NetworkRequest request = nai.requestAt(i);

            final NetworkRequestInfo nri = mNetworkRequests.get(request);

            ensureRunningOnConnectivityServiceThread();

            final NetworkAgentInfo currentNetwork = nri.mSatisfier;

            if (currentNetwork != null && currentNetwork.network.netId == nai.network.netId) {

                nri.mSatisfier = null;
@@ -3447,7 +3446,6 @@ public class ConnectivityService extends IConnectivityManager.Stub 


            // If this Network is already the highest scoring Network for a request, or if

            // there is hope for it to become one if it validated, then it is needed.

            ensureRunningOnConnectivityServiceThread();

            if (nri.request.isRequest() && nai.satisfies(nri.request) &&

                    (nai.isSatisfyingRequest(nri.request.requestId) ||

                    // Note that this catches two important cases:
@@ -3486,7 +3484,6 @@ public class ConnectivityService extends IConnectivityManager.Stub 
        if (mNetworkRequests.get(nri.request) == null) {

            return;

        }

        ensureRunningOnConnectivityServiceThread();

        if (nri.mSatisfier != null) {

            return;

        }
@@ -3524,7 +3521,6 @@ public class ConnectivityService extends IConnectivityManager.Stub 
        mNetworkRequestInfoLogs.log("RELEASE " + nri);

        if (nri.request.isRequest()) {

            boolean wasKept = false;

            ensureRunningOnConnectivityServiceThread();

            final NetworkAgentInfo nai = nri.mSatisfier;

            if (nai != null) {

                boolean wasBackgroundNetwork = nai.isBackgroundNetwork();