Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Merge "Decrement networkRequestPerUid when callbacks are unregistered." am: 91082128c8 am: fb3a30721d am: ac99ab6d31" into rvc-d1-dev-plus-aosp am: c6f71c443e

Browse Source 
Change-Id: I9fa66961285f5aefb0656853ec114399e49a8feb
This commit is contained in:
Automerger Merge Worker
2020-03-31 19:08:55 +00:00
parent 041c7936e1 c6f71c443e
commit 0cfa65309a
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/ConnectivityService.java
View File

@@ -7902,6 +7902,11 @@ public class ConnectivityService extends IConnectivityManager.Stub
return; return;
} }
// Decrement the reference count for this NetworkRequestInfo. The reference count is
// incremented when the NetworkRequestInfo is created as part of
// enforceRequestCountLimit().
decrementNetworkRequestPerUidCount(nri);
cb.asBinder().unlinkToDeath(mConnectivityDiagnosticsCallbacks.remove(cb), 0); cb.asBinder().unlinkToDeath(mConnectivityDiagnosticsCallbacks.remove(cb), 0);
} }