Merge "change NMS removeNetwork to netd binder variant" am: e61ee4198e

am: b73571b981 Change-Id: I6de7f38c7081e14d817cc7aad44cb5b6a978328b
2018-01-15 14:38:08 +00:00
parent 420d020689 454b42eced
commit 898092a149
1 changed files with 2 additions and 0 deletions
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -2472,6 +2472,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
    private void handleRemoveNetworkRequest(final NetworkRequestInfo nri) {
        nri.unlinkDeathRecipient();
        mNetworkRequests.remove(nri.request);
+
        synchronized (mUidToNetworkRequestCount) {
            int requests = mUidToNetworkRequestCount.get(nri.mUid, 0);
            if (requests < 1) {
@@ -2484,6 +2485,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
                mUidToNetworkRequestCount.put(nri.mUid, requests - 1);
            }
        }
+
        mNetworkRequestInfoLogs.log("RELEASE " + nri);
        if (nri.request.isRequest()) {
            boolean wasKept = false;