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

am: 898092a149

Change-Id: I38905b12f24f16860de1db18cd12d93fc661c684
This commit is contained in:
Erik Kline
2018-01-15 14:54:30 +00:00
committed by android-build-merger

View File

@@ -2500,6 +2500,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) {
@@ -2512,6 +2513,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
mUidToNetworkRequestCount.put(nri.mUid, requests - 1);
}
}
mNetworkRequestInfoLogs.log("RELEASE " + nri);
if (nri.request.isRequest()) {
boolean wasKept = false;